@platformatic/sql-graphql 0.20.1 → 0.21.1

package/lib/entity-to-type.js

@@ -99,27 +99,39 @@ function constructGraph (app, entity, opts, ignore) {
     return ['and', key]
   }).flat())].join('_'))
 
+  const whereFields = Object.keys(fields).reduce((acc, field) => {
+    acc[field] = {
+      type: new graphql.GraphQLInputObjectType({
+        name: `${entityName}WhereArguments${field}`,
+        fields: {
+          eq: { type: fields[field].type },
+          neq: { type: fields[field].type },
+          gt: { type: fields[field].type },
+          gte: { type: fields[field].type },
+          lt: { type: fields[field].type },
+          lte: { type: fields[field].type },
+          like: { type: fields[field].type },
+          in: { type: new graphql.GraphQLList(fields[field].type) },
+          nin: { type: new graphql.GraphQLList(fields[field].type) }
+        }
+      })
+    }
+    return acc
+  }, {})
+
   const whereArgType = new graphql.GraphQLInputObjectType({
     name: `${entityName}WhereArguments`,
-    fields: Object.keys(fields).reduce((acc, field) => {
-      acc[field] = {
-        type: new graphql.GraphQLInputObjectType({
-          name: `${entityName}WhereArguments${field}`,
+    fields: {
+      ...whereFields,
+      or: {
+        type: new graphql.GraphQLList(new graphql.GraphQLInputObjectType({
+          name: `${entityName}WhereArgumentsOr`,
           fields: {
-            eq: { type: fields[field].type },
-            neq: { type: fields[field].type },
-            gt: { type: fields[field].type },
-            gte: { type: fields[field].type },
-            lt: { type: fields[field].type },
-            lte: { type: fields[field].type },
-            like: { type: fields[field].type },
-            in: { type: new graphql.GraphQLList(fields[field].type) },
-            nin: { type: new graphql.GraphQLList(fields[field].type) }
+            ...whereFields
           }
-        })
+        }))
       }
-      return acc
-    }, {})
+    }
   })
 
   queryTopFields[getBy] = {

package/lib/utils.js

@@ -19,7 +19,7 @@ function sqlTypeToGraphQL (sqlType) {
     case 'smallint':
       return graphql.GraphQLInt
     case 'decimal':
-      return graphql.GraphQLInt
+      return graphql.GraphQLString
     case 'bigint':
       return graphql.GraphQLString
     case 'int2':
@@ -43,7 +43,7 @@ function sqlTypeToGraphQL (sqlType) {
     case 'double precision':
       return graphql.GraphQLFloat
     case 'numeric':
-      return graphql.GraphQLFloat
+      return graphql.GraphQLString
     case 'float4':
       return graphql.GraphQLFloat
     case 'date':
@@ -53,7 +53,7 @@ function sqlTypeToGraphQL (sqlType) {
     case 'timestamp':
       return scalars.GraphQLDateTime
     case 'uuid':
-      return graphql.GraphQLString
+      return graphql.GraphQLID
     case 'json':
       return GraphQLJSONObject
     case 'jsonb':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "0.20.1",
+  "version": "0.21.1",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "repository": {
@@ -21,8 +21,8 @@
     "tap": "^16.3.4",
     "tsd": "^0.28.0",
     "ws": "^8.12.1",
-    "@platformatic/sql-events": "0.20.1",
-    "@platformatic/sql-mapper": "0.20.1"
+    "@platformatic/sql-events": "0.21.1",
+    "@platformatic/sql-mapper": "0.21.1"
   },
   "dependencies": {
     "@mercuriusjs/federation": "^1.0.1",

package/test/datatypes.test.js

@@ -58,7 +58,7 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
                               uuid: "12345678-1234-1234-1234-123456789012",
                               aReal: 1.2,
                               aSmallint: 42,
-                              aDecimal: 42,
+                              aDecimal: "42",
                               anEnum: value1
                             }) {
               id
@@ -92,7 +92,7 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
           uuid: '12345678-1234-1234-1234-123456789012',
           aReal: 1.2,
           aSmallint: 42,
-          aDecimal: 42,
+          aDecimal: '42',
           anEnum: 'value1'
         }
       }
@@ -303,7 +303,7 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
                               uuid: "12345678-1234-1234-1234-123456789012",
                               aReal: 1.2,
                               aSmallint: 42,
-                              aDecimal: 42,
+                              aDecimal: "42",
                               anEnum: value1
                             }) {
               id
@@ -337,7 +337,7 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
           uuid: '12345678-1234-1234-1234-123456789012',
           aReal: 1.2,
           aSmallint: 42,
-          aDecimal: 42,
+          aDecimal: '42',
           anEnum: 'value1'
         }
       }
@@ -383,7 +383,7 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
           uuid: '12345678-1234-1234-1234-123456789012',
           aReal: 1.2,
           aSmallint: 42,
-          aDecimal: 42,
+          aDecimal: '42',
           anEnum: 'value1'
         }
       }
@@ -546,7 +546,7 @@ test('[SQLite] simple db simple graphql schema', { skip: !isSQLite }, async ({ p
                               uuid: "12345678-1234-1234-1234-123456789012",
                               aReal: 1.2,
                               aSmallint: 42,
-                              aDecimal: 42 }) {
+                              aDecimal: "42" }) {
               id
               published
               current
@@ -573,7 +573,7 @@ test('[SQLite] simple db simple graphql schema', { skip: !isSQLite }, async ({ p
           uuid: '12345678-1234-1234-1234-123456789012',
           aReal: 1.2,
           aSmallint: 42,
-          aDecimal: 42
+          aDecimal: '42'
         }
       }
     }, 'saveSimpleType response')
@@ -613,7 +613,7 @@ test('[SQLite] simple db simple graphql schema', { skip: !isSQLite }, async ({ p
           uuid: '12345678-1234-1234-1234-123456789012',
           aReal: 1.2,
           aSmallint: 42,
-          aDecimal: 42
+          aDecimal: '42'
         }
       }
     }, 'getSimpleTypeById response')

package/test/or.test.js

@@ -0,0 +1,302 @@
+'use strict'
+
+const { test } = require('tap')
+const sqlGraphQL = require('..')
+const sqlMapper = require('@platformatic/sql-mapper')
+const fastify = require('fastify')
+const { clear, connInfo, isSQLite } = require('./helper')
+
+test('list', async ({ pass, teardown, same, equal }) => {
+  const app = fastify()
+  app.register(sqlMapper, {
+    ...connInfo,
+    async onDatabaseLoad (db, sql) {
+      pass('onDatabaseLoad called')
+
+      await clear(db, sql)
+
+      if (isSQLite) {
+        await db.query(sql`CREATE TABLE posts (
+          id INTEGER PRIMARY KEY,
+          title VARCHAR(42),
+          long_text TEXT,
+          counter INTEGER
+        );`)
+      } else {
+        await db.query(sql`CREATE TABLE posts (
+          id SERIAL PRIMARY KEY,
+          title VARCHAR(42),
+          long_text TEXT,
+          counter INTEGER
+        );`)
+      }
+    }
+  })
+  app.register(sqlGraphQL)
+  teardown(app.close.bind(app))
+
+  await app.ready()
+
+  const posts = [{
+    title: 'Dog',
+    longText: 'Foo',
+    counter: 10
+  }, {
+    title: 'Cat',
+    longText: 'Bar',
+    counter: 20
+  }, {
+    title: 'Mouse',
+    longText: 'Baz',
+    counter: 30
+  }, {
+    title: 'Duck',
+    longText: 'A duck tale',
+    counter: 40
+  }]
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+            mutation batch($inputs : [PostInput]!) {
+              insertPosts(inputs: $inputs) {
+                id
+                title
+              }
+            }
+          `,
+        variables: {
+          inputs: posts
+        }
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { title: { eq: "Dog" } }, { title: { eq: "Cat" } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '2', title: 'Cat', longText: 'Bar', counter: 20 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { id: { eq: 1 }, or: [ { title: { eq: "Dog" } }, { title: { eq: "Cat" } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { counter: { eq: 10 } }, { counter: { eq: 20 } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '2', title: 'Cat', longText: 'Bar', counter: 20 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { counter: { eq: 10 } }, { counter: { gte: 30 } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '3', title: 'Mouse', longText: 'Baz', counter: 30 },
+          { id: '4', title: 'Duck', longText: 'A duck tale', counter: 40 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { title: { eq: "Dog" } }, { title: { eq: "Duck" } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '4', title: 'Duck', longText: 'A duck tale', counter: 40 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { title: { eq: "Dog" } }, { longText: { eq: "Baz" } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '3', title: 'Mouse', longText: 'Baz', counter: 30 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { counter: { in: [10, 20] }, or: [ { title: { eq: "Dog" } }, { longText: { eq: "Baz" } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 }
+        ]
+      }
+    }, 'posts response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { or: [ { counter: { in: [10, 20] } }, { counter: { in: [20, 30] } } ] }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [
+          { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+          { id: '2', title: 'Cat', longText: 'Bar', counter: 20 },
+          { id: '3', title: 'Mouse', longText: 'Baz', counter: 30 }
+        ]
+      }
+    }, 'posts response')
+  }
+})