fix: issue #315 lowercase INSERT results (#316)

closes #315 

* test: check case of the result elements

* test: add read request to TypeChecks

* feat: add createBeer to compare INSERT
between PostgreSQL and sqlite

* fix: issue #315

* test: for issue #315

* chore: set ecmaVers. that allows optional chaining

* fix: use optional chaining

.eslintrc.json

@@ -8,7 +8,7 @@
  "mocha": true
  },
  "parserOptions": {
- "ecmaVersion": 2018
+ "ecmaVersion": 2020
  },
  "globals": {
  "SELECT": true,

__tests__/__assets__/cap-proj/rest-client-test/draft.http

@@ -3,4 +3,7 @@ POST http:https://localhost:4004/beershop/TypeChecksWithDraft
 Accept:application/json;odata.metadata=minimal;IEEE754Compatible=true
 Content-Type:application/json;charset=UTF-8;IEEE754Compatible=true
 
-{}
+{}
+
+### Read TypeChecksWithDraft
+GET http:https://localhost:4004/beershop/TypeChecksWithDraft

__tests__/__assets__/cap-proj/rest-client-test/requests.http

@@ -5,7 +5,12 @@ POST {{$dotenv scpServiceURL}}/beershop/reset
 Content-Type: application/json
 
 {}
+###
+# create a beer using action
+POST {{$dotenv scpServiceURL}}/beershop/createBeer
+Content-Type: application/json
 
+{}
 ###
 # delete a brewery
 DELETE {{$dotenv scpServiceURL}}/beershop/Breweries(0465e9ca-6255-4f5c-b8ba-7439531f8d28)

__tests__/__assets__/cap-proj/srv/beershop-service.cds

@@ -12,4 +12,5 @@ service BeershopService {
 
 extend service BeershopService with {
  action reset();
+ action createBeer();
 }

__tests__/__assets__/cap-proj/srv/beershop-service.js

@@ -10,6 +10,12 @@ module.exports = (srv) => {
  }
  await cds.deploy('./srv/', {}).to(db)
  })
+ srv.on('createBeer', async () => {
+ const { Beers } = cds.entities('csw')
+ const entries = [{ name: 'Beer1', abv: 1.0, ibu: 1, brewery_ID: '0465e9ca-6255-4f5c-b8ba-7439531f8d28' }]
+ const insertResult = await cds.run(INSERT.into(Beers).entries(entries))
+ console.log(insertResult)
+ })
  srv.before('READ', '*', async (req) => {
  if (req.headers.schema) {
  req.user.schema = req.headers.schema

__tests__/lib/pg/ql.test.js

@@ -119,6 +119,11 @@ describe('QL to PostgreSQL', () => {
  expect(results[0].brewery).toHaveProperty('name', 'Rittmayer Hallerndorf')
  expect(results.length).toStrictEqual(4)
  })
+ test('-> case of the query result', async () => {
+ const { TypeChecks } = cds.entities('csw')
+ const results = await cds.run(SELECT.one.from(TypeChecks))
+ expect(results).toHaveProperty('type_Boolean')
+ })
  })
 
  describe('INSERT', () => {
@@ -176,11 +181,11 @@ describe('QL to PostgreSQL', () => {
  expect(insertResult.affectedRows).toStrictEqual(3)
  expect(insertResult == 3).toStrictEqual(true)
  expect(insertResult.valueOf()).toStrictEqual(insertResult.affectedRows)
- const beers = [...entries]
+ const beers = insertResult.results
  expect(beers.length).toStrictEqual(3)
  expect(beers[0].ID).toMatch(uuidRegex)
- expect(beers[0].createdAt).toMatch(timestampRegex)
- expect(beers[0].modifiedAt).toMatch(timestampRegex)
+ expect(beers[0].createdAt.toISOString()).toMatch(timestampRegex)
+ expect(beers[0].modifiedAt.toISOString()).toMatch(timestampRegex)
  })
  })
 

lib/pg/execute.js

@@ -84,7 +84,8 @@ const executeInsertCQN = async (model, dbc, cqn, user, locale, txTimestamp) => {
 
  let results = await Promise.all(resultPromises)
  results = flattenArray(results)
- results = results.map((result) => remapColumnNames(model.definitions[cqn.INSERT.into], result))
+ const entity = cqn.INSERT?.into?.ref?.[0] ? cqn.INSERT.into.ref[0] : cqn.INSERT.into
+ results = results.map((result) => remapColumnNames(model.definitions[entity], result))
  return results
 }