test: adopt @cap-js/sqlite (#157)

johannes-vogel · web-flow · commit 9ed44e0108b2 · 2024-02-23T12:35:02.000+01:00
diff --git a/lib/resolvers/crud/read.js b/lib/resolvers/crud/read.js
@@ -10,7 +10,8 @@ module.exports = async ({ req, res }, service, entity, selection) => {
   const args = selection.arguments
 
   let query = SELECT.from(entity)
-  query.columns(astToColumns(entity, selection.selectionSet.selections, true))
+  const columns = astToColumns(entity, selection.selectionSet.selections, true)
+  if (columns.length) query.columns(columns)
 
   const filter = getArgumentByName(args, ARGS.filter)
   if (filter) {
diff --git a/package.json b/package.json
@@ -45,6 +45,6 @@
     "express": "^4.17.1",
     "jest": "^29.3.1",
     "semver": "^7.4.0",
-    "sqlite3": "^5.0.2"
+    "@cap-js/sqlite": "^1"
   }
 }
diff --git a/test/resources/annotations/package.json b/test/resources/annotations/package.json
@@ -2,6 +2,9 @@
   "dependencies": {
     "@cap-js/graphql": "*"
   },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  },
   "cds": {
     "protocols": {
       "graphql": {
diff --git a/test/resources/bookshop-graphql/package.json b/test/resources/bookshop-graphql/package.json
@@ -2,10 +2,14 @@
   "dependencies": {
     "@cap-js/graphql": "*"
   },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  },
   "cds": {
     "requires": {
       "db": {
         "kind": "sqlite",
+        "impl": "@cap-js/sqlite",
         "credentials": {
           "database": ":memory:"
         }
diff --git a/test/resources/bookshop/package.json b/test/resources/bookshop/package.json
@@ -13,6 +13,9 @@
     "@sap/cds": ">=5.9",
     "express": "^4.17.1"
   },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  },
   "scripts": {
     "genres": "cds serve test/genres.cds",
     "start": "cds run",
diff --git a/test/resources/cds.Request/package.json b/test/resources/cds.Request/package.json
@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "@cap-js/graphql": "*"
+  },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
   }
 }
diff --git a/test/resources/concurrency/package.json b/test/resources/concurrency/package.json
@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "@cap-js/graphql": "*"
+  },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
   }
 }
diff --git a/test/resources/custom-error-formatter/package.json b/test/resources/custom-error-formatter/package.json
@@ -2,6 +2,9 @@
   "dependencies": {
     "@cap-js/graphql": "*"
   },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  },
   "cds": {
     "protocols": {
       "graphql": {
diff --git a/test/resources/custom-handlers/package.json b/test/resources/custom-handlers/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  }
+}
diff --git a/test/resources/edge-cases/package.json b/test/resources/edge-cases/package.json
@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "@cap-js/graphql": "*"
+  },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
   }
 }
diff --git a/test/resources/error-handling/package.json b/test/resources/error-handling/package.json
@@ -2,6 +2,9 @@
   "dependencies": {
     "@cap-js/graphql": "*"
   },
+  "devDependencies": {
+    "@cap-js/sqlite": "*"
+  },
   "cds": {
     "requires": {
       "db": {
diff --git a/test/resources/types/package.json b/test/resources/types/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@cap-js/sqlite": "*"
+  }
+}
diff --git a/test/tests/queries/filter.test.js b/test/tests/queries/filter.test.js
@@ -290,7 +290,7 @@ describe('graphql - filter', () => {
         const query = gql`
           {
             AdminService {
-              Books(filter: [{ ID: { in: [201, 251] } }, { title: { contains: "cat" } }]) {
+              Books(filter: [{ ID: { in: [201, 251] } }, { title: { contains: "Cat" } }]) {
                 nodes {
                   ID
                   title
@@ -468,10 +468,10 @@ describe('graphql - filter', () => {
               Books(
                 filter: [
                   {
-                    title: [{ startswith: "the", endswith: "raven" }, { contains: "height" }]
+                    title: [{ startswith: "The", endswith: "Raven" }, { contains: "Height" }]
                     ID: [{ eq: 201 }, { eq: 251 }]
                   }
-                  { title: { contains: "cat" } }
+                  { title: { contains: "Cat" } }
                 ]
               ) {
                 nodes {
diff --git a/test/tests/queries/paging-offset.test.js b/test/tests/queries/paging-offset.test.js
@@ -61,19 +61,27 @@ describe('graphql - offset-based paging', () => {
         }
       `
       const data = {
-        AdminServiceBasic: {
-          Authors: null
+        AdminService: {
+          Authors: [
+            {
+              name: 'Edgar Allen Poe',
+              books: [
+                // Edgar Allen Poe has 2 books, but only 1 requested.
+                {
+                  title: 'Eleonora'
+                }
+              ]
+            },
+            {
+              name: 'Richard Carpenter',
+              books: []
+            }
+          ]
         }
       }
-      const errors = [
-        {
-          locations: [{ column: 13, line: 4 }],
-          message: 'Pagination is not supported in expand',
-          path: ['AdminServiceBasic', 'Authors']
-        }
-      ]
+
       const response = await POST('/graphql', { query })
-      expect(response.data).toEqual({ data, errors })
+      expect(response.data).toEqual({ data })
     })
   })
 
@@ -139,19 +147,32 @@ describe('graphql - offset-based paging', () => {
       `
       const data = {
         AdminService: {
-          Authors: null
+          Authors: {
+            nodes: [
+              {
+                name: 'Edgar Allen Poe',
+                books: {
+                  // Edgar Allen Poe has 2 books, but only 1 requested.
+                  nodes: [
+                    {
+                      title: 'Eleonora'
+                    }
+                  ]
+                }
+              },
+              {
+                name: 'Richard Carpenter',
+                books: {
+                  nodes: []
+                }
+              }
+            ]
+          }
         }
       }
-      const errors = [
-        {
-          locations: [{ column: 13, line: 4 }],
-          message: 'Pagination is not supported in expand',
-          path: ['AdminService', 'Authors'],
-          extensions: expect.any(Object)
-        }
-      ]
+
       const response = await POST('/graphql', { query })
-      expect(response.data).toEqual({ data, errors })
+      expect(response.data).toEqual({ data })
     })
   })
 })
diff --git a/test/tests/queries/totalCount.test.js b/test/tests/queries/totalCount.test.js
@@ -160,19 +160,34 @@ describe('graphql - queries with totalCount', () => {
     `
     const data = {
       AdminService: {
-        Authors: null
+        Authors: {
+          totalCount: 4,
+          nodes: [
+            {
+              name: 'Edgar Allen Poe',
+              books: {
+                totalCount: null, // REVISIT: expected 2
+                nodes: [
+                  {
+                    title: 'Eleonora'
+                  }
+                ]
+              }
+            },
+            {
+              name: 'Richard Carpenter',
+              books: {
+                totalCount: null, // REVISIT: expected 0
+                nodes: []
+              }
+            }
+          ]
+        }
       }
     }
-    const errors = [
-      {
-        locations: [{ column: 11, line: 4 }],
-        message: 'Pagination is not supported in expand',
-        path: ['AdminService', 'Authors'],
-        extensions: expect.any(Object)
-      }
-    ]
+
     const response = await POST('/graphql', { query })
-    expect(response.data).toEqual({ data, errors })
+    expect(response.data).toEqual({ data })
   })
 
   test('query with aliases on totalCount on nested fields', async () => {

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@`
`45`	`45`	`"express": "^4.17.1",`
`46`	`46`	`"jest": "^29.3.1",`
`47`	`47`	`"semver": "^7.4.0",`
`48`		`- "sqlite3": "^5.0.2"`
	`48`	`+ "@cap-js/sqlite": "^1"`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"@cap-js/graphql": "*"`
	`4`	`+ },`
	`5`	`+ "devDependencies": {`
	`6`	`+ "@cap-js/sqlite": "*"`
`4`	`7`	`}`
`5`	`8`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "devDependencies": {
 +    "@cap-js/sqlite": "*"
 +  }
 +}