@platformatic/sql-graphql 0.6.1 → 0.8.0

package/lib/entity-to-type.js

@@ -16,7 +16,7 @@ const ascDesc = new graphql.GraphQLEnumType({
 })
 
 function constructGraph (app, entity, opts) {
-  const primaryKey = camelcase(entity.primaryKey)
+  const primaryKeys = Array.from(entity.primaryKeys).map((key) => camelcase(key))
   const relationalFields = entity.relations
     .map((relation) => relation.column_name)
   const entityName = entity.name
@@ -36,7 +36,18 @@ function constructGraph (app, entity, opts) {
   for (const key of Object.keys(entity.fields)) {
     const field = entity.fields[key]
     const meta = { field }
-    meta.type = sqlTypeToGraphQL(field.sqlType)
+
+    // sqlite doesn't support enums
+    /* istanbul ignore next */
+    if (field.enum) {
+      const enumValues = field.enum.reduce((acc, enumValue) => {
+        acc[enumValue] = { value: enumValue }
+        return acc
+      }, {})
+      meta.type = new graphql.GraphQLEnumType({ name: key, values: enumValues })
+    } else {
+      meta.type = sqlTypeToGraphQL(field.sqlType)
+    }
     if (field.primaryKey) {
       meta.primaryKeyType = field.type
       meta.type = graphql.GraphQLID
@@ -55,7 +66,12 @@ function constructGraph (app, entity, opts) {
   resolvers.Mutation = resolvers.Mutation || {}
   loaders.Query = loaders.Query || {}
 
-  const getBy = camelcase(['get', singular, 'by', primaryKey])
+  const getBy = camelcase(['get', singular, ...(primaryKeys.map((key, i) => {
+    if (i === 0) {
+      return ['by', key]
+    }
+    return ['and', key]
+  }).flat())].join('_'))
 
   const whereArgType = new graphql.GraphQLInputObjectType({
     name: `${entityName}WhereArguments`,
@@ -70,6 +86,7 @@ function constructGraph (app, entity, opts) {
             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) }
           }
@@ -82,14 +99,21 @@ function constructGraph (app, entity, opts) {
   queryTopFields[getBy] = {
     type,
     args: {
-      [primaryKey]: { type: new graphql.GraphQLNonNull(fields[primaryKey].type) }
+      ...(primaryKeys.reduce((acc, primaryKey) => {
+        acc[primaryKey] = { type: new graphql.GraphQLNonNull(fields[primaryKey].type) }
+        return acc
+      }, {}))
     }
   }
   loaders.Query[getBy] = {
     loader (queries, ctx) {
       const keys = []
       for (const query of queries) {
-        keys.push(query.params[primaryKey])
+        const pairs = []
+        for (const key of primaryKeys) {
+          pairs.push({ key, value: query.params[key] })
+        }
+        keys.push(pairs)
       }
       return loadMany(keys, queries, ctx)
     },
@@ -127,7 +151,9 @@ function constructGraph (app, entity, opts) {
 
   resolvers.Query[plural] = (_, query, ctx, info) => {
     const requestedFields = info.fieldNodes[0].selectionSet.selections.map((s) => s.name.value)
-    requestedFields.push(primaryKey)
+    for (const primaryKey of primaryKeys) {
+      requestedFields.push(primaryKey)
+    }
     return entity.find({ ...query, fields: [...requestedFields, ...relationalFields], ctx })
   }
 
@@ -161,7 +187,9 @@ function constructGraph (app, entity, opts) {
 
   resolvers.Query[count] = async (_, query, ctx, info) => {
     const requestedFields = info.fieldNodes[0].selectionSet.selections.map((s) => s.name.value)
-    requestedFields.push(primaryKey)
+    for (const primaryKey of primaryKeys) {
+      requestedFields.push(primaryKey)
+    }
     const total = await entity.count({ ...query, fields: [...requestedFields, ...relationalFields], ctx })
     return { total }
   }
@@ -209,14 +237,21 @@ function constructGraph (app, entity, opts) {
 
   federationReplacements.push({
     find: new RegExp(`type ${entityName}`),
-    replace: `type ${entityName} @key(fields: "${primaryKey}")`
+    replace: `type ${entityName} @key(fields: "${primaryKeys}")`
   })
 
   if (federationMetadata) {
     loaders[entityName] = loaders[entityName] || {}
     loaders[entityName].__resolveReference = {
       loader (queries, ctx) {
-        const keys = queries.map(({ obj }) => obj[primaryKey])
+        const keys = []
+        for (const { obj } of queries) {
+          const pairs = []
+          for (const key of primaryKeys) {
+            pairs.push({ key, value: obj[key] })
+          }
+          keys.push(pairs)
+        }
         return loadMany(keys, queries, ctx)
       },
       opts: {
@@ -235,25 +270,47 @@ function constructGraph (app, entity, opts) {
 
   async function loadMany (keys, queries, ctx) {
     const fields = getFields(queries)
-    const res = await entity.find({
-      where: {
-        [primaryKey]: {
-          in: keys
+
+    // TODO this is inefficient as it might load
+    // more data than needed if there are more than
+    // one primary key
+    const where = keys.reduce((acc, pairs) => {
+      pairs.reduce((acc, { key, value }) => {
+        if (acc[key]) {
+          acc[key].in.push(value)
+        } else {
+          acc[key] = {
+            in: [value]
+          }
         }
-      },
+        return acc
+      }, acc)
+      return acc
+    }, {})
+
+    const res = await entity.find({
+      where,
       fields,
       ctx
     })
 
-    const map = {}
-
-    for (const row of res) {
-      map[row[primaryKey]] = row
-    }
-
     const output = []
-    for (const key of keys) {
-      output.push(map[key])
+    // TODO this is extremely inefficient
+    // we need a better data structure
+    for (const pair of keys) {
+      for (const row of res) {
+        let target = row
+        for (const { key, value } of pair) {
+          if (row[key] !== value) {
+            target = null
+            break
+          }
+        }
+
+        if (target) {
+          output.push(target)
+        }
+      }
     }
 
     return output
@@ -261,7 +318,9 @@ function constructGraph (app, entity, opts) {
 
   function getFields (queries) {
     const fields = new Set([...relationalFields])
-    fields.add(primaryKey)
+    for (const primaryKey of primaryKeys) {
+      fields.add(primaryKey)
+    }
     for (const query of queries) {
       fromSelectionSet(query.info.fieldNodes[0].selectionSet, fields)
     }

package/lib/relationship.js

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint camelcase: 0 */
+
 const camelcase = require('camelcase')
 const {
   fromSelectionSet
@@ -13,28 +15,32 @@ module.exports = function establishRelations (app, relations, resolvers, loaders
     const entity = entities[key]
     tablesTypeMap[entity.table] = metaMap.get(entity)
   }
-  for (const relation of relations) {
-    assert(relation.table_name, 'table_name is required')
-    assert(relation.foreign_table_name, 'foreign_table_name is required')
-    assert(relation.column_name.toLowerCase().endsWith('id'), 'The column with id reference must be ended with `id` postfix')
+  for (const { table_name, foreign_table_name, column_name, foreign_column_name } of relations) {
+    const enhanceAssertLogMsg = `(table: "${table_name}", foreign table: "${foreign_table_name}", column: "${column_name}")`
+
+    assert(table_name, `table_name is required ${enhanceAssertLogMsg}`)
+    assert(foreign_table_name, `foreign_table_name is required ${enhanceAssertLogMsg}`)
+    assert(column_name.toLowerCase().endsWith('id'), `The column with id reference must be ended with "id" postfix ${enhanceAssertLogMsg}`)
 
-    const current = tablesTypeMap[relation.table_name]
-    const foreign = tablesTypeMap[relation.foreign_table_name]
-    assert(foreign !== undefined, `No foreign table named "${relation.foreign_table_name}" was found`)
+    const current = tablesTypeMap[table_name]
+    const foreign = tablesTypeMap[foreign_table_name]
+    assert(foreign !== undefined, `No foreign table named "${foreign_table_name}" was found ${enhanceAssertLogMsg}`)
 
     // current to foreign
     {
-      const lowered = lowerCaseFirst(camelcase(cutOutIdEnding(relation.column_name)))
+      const lowered = lowerCaseFirst(camelcase(cutOutIdEnding(column_name)))
       if (!relationships[current.type] || relationships[current.type][lowered] !== false) {
         current.fields[lowered] = { type: foreign.type }
-        const originalField = camelcase(relation.column_name)
+        const originalField = camelcase(column_name)
         delete current.fields[originalField]
         loaders[current.type] = loaders[current.type] || resolvers[current.type] || {}
+        const key = camelcase(foreign_column_name)
         loaders[current.type][lowered] = {
           loader (queries, ctx) {
-            const keys = queries.map(({ obj }) => {
-              return obj[originalField]
-            })
+            const keys = []
+            for (const { obj } of queries) {
+              keys.push([{ key, value: obj[originalField].toString() }])
+            }
             return foreign.loadMany(keys, queries, ctx)
           },
           opts: {
@@ -44,17 +50,18 @@ module.exports = function establishRelations (app, relations, resolvers, loaders
       }
     }
 
-    // foreign to current
-    {
+    // foreign to current, we skip this if the current table has a composite primary key
+    // TODO implement support for this case
+    if (current.entity.primaryKeys.size === 1) {
       const lowered = lowerCaseFirst(camelcase(current.entity.table))
       if (!relationships[foreign.type] || relationships[foreign.type][lowered] !== false) {
         foreign.fields[lowered] = queryTopFields[lowered]
         resolvers[foreign.type] = resolvers[foreign.type] || {}
         const resolveRelation = async function (obj, args, ctx, info) {
           const fields = fromSelectionSet(info.fieldNodes[0].selectionSet, new Set())
-          const toSearch = { ...args, fields: [...fields, relation.column_name], ctx }
+          const toSearch = { ...args, fields: [...fields, column_name], ctx }
           toSearch.where = toSearch.where || {}
-          toSearch.where[camelcase(relation.column_name)] = { eq: obj.id }
+          toSearch.where[camelcase(column_name)] = { eq: obj.id }
           return current.entity.find(toSearch)
         }
         if (resolvers[foreign.type][lowered] === undefined) {

package/lib/subscriptions.js

@@ -9,6 +9,14 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
     if (ignores.indexOf(field.singularName) >= 0) {
       continue
     }
+    // TODO currently we are not supporting subscriptions for
+    // entities that have a composite primary key
+    /* istanbul ignore next */
+    if (field.primaryKeys.size !== 1) {
+      continue
+    }
+    const entity = app.platformatic.entities[field.singularName]
+    const primaryKey = entity.primaryKeys.values().next().value
     const { type } = meta
     const saved = `${field.singularName}Saved`
     fields[saved] = {
@@ -18,11 +26,9 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
       subscribe: async function * (_, query, ctx, info) {
         const log = ctx.reply.request.log
         const { pubsub } = ctx
-        const entity = app.platformatic.entities[field.singularName]
         const topic = await entity.getSubscriptionTopic({ action: 'save', ctx })
         log.trace({ topic }, 'subscribed')
         const res = await pubsub.subscribe(topic)
-        const primaryKey = entity.primaryKey
         const fields = meta.getFields([{ info }])
 
         for await (const msg of res) {
@@ -55,8 +61,8 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
       type: new graphql.GraphQLObjectType({
         name: `${field.name}Deleted`,
         fields: {
-          [field.primaryKey]: {
-            type: meta.fields[field.primaryKey].type
+          [primaryKey]: {
+            type: meta.fields[primaryKey].type
           }
         }
       })
@@ -64,7 +70,6 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
     resolvers.Subscription[deleted] = {
       subscribe: async (_, query, ctx, info) => {
         const { pubsub } = ctx
-        const entity = app.platformatic.entities[field.singularName]
         const topic = await entity.getSubscriptionTopic({ action: 'delete', ctx })
         const res = await pubsub.subscribe(topic)
         ctx.reply.request.log.trace({ topic }, 'subscribed')

package/lib/utils.js

@@ -54,6 +54,8 @@ function sqlTypeToGraphQL (sqlType) {
       return graphql.GraphQLString
     case 'json':
       return GraphQLJSONObject
+    case 'jsonb':
+      return GraphQLJSONObject
     default:
       return graphql.GraphQLString
   }

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/plaformatic/platformatic.git"
+    "url": "git+https://github.com/platformatic/platformatic.git"
   },
   "author": "Matteo Collina <hello@matteocollina.com>",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/plaformatic/platformatic/issues"
+    "url": "https://github.com/platformatic/platformatic/issues"
   },
-  "homepage": "https://github.com/plaformatic/platformatic#readme",
+  "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "@platformatic/sql-events": "0.6.1",
-    "@platformatic/sql-mapper": "0.6.1",
+    "@platformatic/sql-events": "0.8.0",
+    "@platformatic/sql-mapper": "0.8.0",
     "fastify": "^4.6.0",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",

package/test/composite.test.js

@@ -0,0 +1,331 @@
+'use strict'
+
+const { clear, connInfo, isSQLite, isMysql, isPg } = require('./helper')
+const { test } = require('tap')
+const fastify = require('fastify')
+const sqlMapper = require('@platformatic/sql-mapper')
+const sqlGraphQL = require('..')
+
+test('composite primary keys', async ({ equal, same, teardown, rejects }) => {
+  /* https://github.com/platformatic/platformatic/issues/299 */
+  async function onDatabaseLoad (db, sql) {
+    await clear(db, sql)
+
+    if (isSQLite) {
+      await db.query(sql`CREATE TABLE pages (
+        id INTEGER PRIMARY KEY,
+        the_title VARCHAR(42)
+      );`)
+
+      await db.query(sql`CREATE TABLE users (
+        id INTEGER PRIMARY KEY,
+        username VARCHAR(255) NOT NULL
+      );`)
+
+      await db.query(sql`CREATE TABLE editors (
+        page_id INTEGER NOT NULL,
+        user_id INTEGER NOT NULL,
+        role VARCHAR(255) NOT NULL,
+        CONSTRAINT fk_editor_pages FOREIGN KEY (page_id) REFERENCES pages(id),
+        CONSTRAINT fk_editor_users FOREIGN KEY (user_id) REFERENCES users(id),
+        PRIMARY KEY (page_id, user_id)
+      );`)
+    } else if (isPg) {
+      await db.query(sql`CREATE TABLE pages (
+        id SERIAL PRIMARY KEY,
+        the_title VARCHAR(255) NOT NULL
+      );`)
+
+      await db.query(sql`CREATE TABLE users (
+        id SERIAL PRIMARY KEY,
+        username VARCHAR(255) NOT NULL
+      );`)
+
+      await db.query(sql`CREATE TABLE editors (
+        page_id INTEGER NOT NULL,
+        user_id INTEGER NOT NULL,
+        role VARCHAR(255) NOT NULL,
+        CONSTRAINT fk_editor_pages FOREIGN KEY (page_id) REFERENCES pages(id),
+        CONSTRAINT fk_editor_users FOREIGN KEY (user_id) REFERENCES users(id),
+        PRIMARY KEY (page_id, user_id)
+      );`)
+    } else if (isMysql) {
+      await db.query(sql`CREATE TABLE pages (
+        id INTEGER PRIMARY KEY AUTO_INCREMENT,
+        the_title VARCHAR(255) NOT NULL
+      );`)
+
+      await db.query(sql`CREATE TABLE users (
+        id INTEGER PRIMARY KEY AUTO_INCREMENT,
+        username VARCHAR(255) NOT NULL
+      );`)
+
+      await db.query(sql`CREATE TABLE editors (
+        page_id INTEGER NOT NULL,
+        user_id INTEGER NOT NULL,
+        role VARCHAR(255) NOT NULL,
+        CONSTRAINT \`fk_editor_pages\` FOREIGN KEY (page_id) REFERENCES pages (id) ON DELETE CASCADE ON UPDATE RESTRICT,
+        CONSTRAINT \`fk_editor_users\` FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT,
+        PRIMARY KEY (page_id, user_id)
+      );`)
+    }
+  }
+
+  const app = fastify()
+  app.register(sqlMapper, {
+    ...connInfo,
+    onDatabaseLoad
+  })
+  app.register(sqlGraphQL)
+  teardown(app.close.bind(app))
+
+  await app.ready()
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            savePage(input: { theTitle: "foobar" }) {
+              id
+              theTitle
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'savePage status code')
+    same(res.json(), {
+      data: {
+        savePage: {
+          id: 1,
+          theTitle: 'foobar'
+        }
+      }
+    }, 'savePage response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            saveUser(input: { username: "mcollina" }) {
+              id
+              username
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'saveUser status code')
+    same(res.json(), {
+      data: {
+        saveUser: {
+          id: 1,
+          username: 'mcollina'
+        }
+      }
+    }, 'saveUser response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            saveUser(input: { username: "lucamaraschi" }) {
+              id
+              username
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'saveUser status code')
+    same(res.json(), {
+      data: {
+        saveUser: {
+          id: 2,
+          username: 'lucamaraschi'
+        }
+      }
+    }, 'saveUser response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            saveEditor(input: { userId: "1", pageId: "1", role: "admin" }) {
+              user {
+                id
+                username
+              }
+              page {
+                id
+                theTitle
+              }
+              role
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'saveEditor status code')
+    same(res.json(), {
+      data: {
+        saveEditor: {
+          user: {
+            id: 1,
+            username: 'mcollina'
+          },
+          page: {
+            id: 1,
+            theTitle: 'foobar'
+          },
+          role: 'admin'
+        }
+      }
+    }, 'saveEditor response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            saveEditor(input: { userId: "2", pageId: "1", role: "author" }) {
+              user {
+                id
+                username
+              }
+              page {
+                id
+                theTitle
+              }
+              role
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'saveEditor status code')
+    same(res.json(), {
+      data: {
+        saveEditor: {
+          user: {
+            id: 2,
+            username: 'lucamaraschi'
+          },
+          page: {
+            id: 1,
+            theTitle: 'foobar'
+          },
+          role: 'author'
+        }
+      }
+    }, 'saveEditor response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            saveEditor(input: { userId: "1", pageId: "1", role: "captain" }) {
+              user {
+                id
+                username
+              }
+              page {
+                id
+                theTitle
+              }
+              role
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'saveEditor status code')
+    same(res.json(), {
+      data: {
+        saveEditor: {
+          user: {
+            id: 1,
+            username: 'mcollina'
+          },
+          page: {
+            id: 1,
+            theTitle: 'foobar'
+          },
+          role: 'captain'
+        }
+      }
+    }, 'saveEditor response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'post',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            editors(orderBy: { field: role, direction: DESC }) {
+              user {
+                id
+                username
+              }
+              page {
+                id
+                theTitle
+              }
+              role
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'editors status code')
+    same(res.json(), {
+      data: {
+        editors: [{
+          user: {
+            id: '1',
+            username: 'mcollina'
+          },
+          page: {
+            id: '1',
+            theTitle: 'foobar'
+          },
+          role: 'captain'
+        }, {
+          user: {
+            id: '2',
+            username: 'lucamaraschi'
+          },
+          page: {
+            id: '1',
+            theTitle: 'foobar'
+          },
+          role: 'author'
+        }]
+      }
+    }, 'editor response')
+  }
+})

package/test/datatypes.test.js

@@ -15,7 +15,9 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
 
       await clear(db, sql)
 
-      await db.query(sql`CREATE TABLE simple_types (
+      await db.query(sql`
+      CREATE TYPE simple_enum as ENUM ('value1', 'value2');
+      CREATE TABLE simple_types (
         id SERIAL8 PRIMARY KEY,
         published BOOL,
         current DOUBLE PRECISION,
@@ -26,7 +28,8 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
         uuid UUID UNIQUE,
         a_real real,
         a_smallint smallint,
-        a_decimal decimal
+        a_decimal decimal,
+        an_enum simple_enum
       );`)
     }
   })
@@ -55,7 +58,9 @@ 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
               published
               current
@@ -67,6 +72,7 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
               aReal
               aSmallint
               aDecimal
+              anEnum
             }
           }
         `
@@ -86,7 +92,8 @@ 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'
         }
       }
     }, 'saveSimpleType response')
@@ -111,6 +118,7 @@ test('[PG] simple db simple graphql schema', { skip: !isPg }, async ({ pass, tea
               aReal
               aSmallint
               aDecimal
+              anEnum
             }
           }
         `
@@ -130,7 +138,8 @@ 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'
         }
       }
     }, 'getSimpleTypeById response')
@@ -262,7 +271,8 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
         uuid ${uuidType} UNIQUE,
         a_real real,
         a_smallint smallint,
-        a_decimal decimal
+        a_decimal decimal,
+        an_enum enum ('value1', 'value2')
       );`)
     }
   })
@@ -293,7 +303,9 @@ 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
               published
               current
@@ -305,6 +317,7 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
               aReal
               aSmallint
               aDecimal
+              anEnum
             }
           }
         `
@@ -324,7 +337,8 @@ 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'
         }
       }
     }, 'saveSimpleType response')
@@ -349,6 +363,7 @@ test('[MySQL] simple db simple graphql schema', { skip: !isMysql }, async ({ pas
               aReal
               aSmallint
               aDecimal
+              anEnum
             }
           }
         `
@@ -368,7 +383,8 @@ 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'
         }
       }
     }, 'getSimpleTypeById response')

package/test/helper.js

@@ -30,6 +30,11 @@ if (!process.env.DB || process.env.DB === 'postgresql') {
 module.exports.connInfo = connInfo
 
 module.exports.clear = async function (db, sql) {
+  try {
+    await db.query(sql`DROP TABLE editors`)
+  } catch (err) {
+  }
+
   try {
     await db.query(sql`DROP TABLE pages`)
   } catch (err) {
@@ -86,4 +91,9 @@ module.exports.clear = async function (db, sql) {
     await db.query(sql`DROP TABLE individuals`)
   } catch (err) {
   }
+
+  try {
+    await db.query(sql`DROP Type simple_enum`)
+  } catch (err) {
+  }
 }

package/test/simple.test.js

@@ -4,7 +4,7 @@ const { test } = require('tap')
 const sqlGraphQL = require('..')
 const sqlMapper = require('@platformatic/sql-mapper')
 const fastify = require('fastify')
-const { clear, connInfo, isSQLite, isMysql, isMariaDB } = require('./helper')
+const { clear, connInfo, isSQLite, isMysql, isMariaDB, isPg } = require('./helper')
 
 async function createBasicPages (db, sql) {
   if (isSQLite) {
@@ -901,3 +901,59 @@ test('deserialize JSON columns', { skip: isSQLite }, async (t) => {
     same(json.data.getPageById.metadata, jsonData)
   }
 })
+
+test('deserialize JSONB columns', { skip: !isPg }, async (t) => {
+  const { pass, teardown, same } = t
+  const app = fastify()
+  const jsonData = {
+    foo: 'bar',
+    baz: 42,
+    items: ['foo', 'bar'],
+    nested: {
+      hello: 'world'
+    }
+  }
+  app.register(sqlMapper, {
+    ...connInfo,
+    async onDatabaseLoad (db, sql) {
+      pass('onDatabaseLoad called')
+
+      await clear(db, sql)
+
+      await db.query(sql`CREATE TABLE pages (
+        id SERIAL PRIMARY KEY,
+        title VARCHAR(255) NOT NULL,
+        metadata JSONB NOT NULL
+      );`)
+
+      await db.query(sql`INSERT INTO pages (id, title, metadata) VALUES (1, 'Hello World', ${JSON.stringify(jsonData)})`)
+    }
+  })
+  app.register(sqlGraphQL, {
+    graphiql: false
+  })
+  teardown(app.close.bind(app))
+
+  await app.ready()
+  const res = await app.inject({
+    method: 'POST',
+    url: '/graphql',
+    body: {
+      query: `
+        query {
+          getPageById(id: 1) {
+            id
+            title
+            metadata
+          }
+        }
+      `
+    }
+  })
+  const json = res.json()
+  if (isMariaDB) {
+    same(json.data.getPageById.metadata, JSON.stringify(jsonData))
+  } else {
+    same(json.data.getPageById.metadata, jsonData)
+  }
+})

package/test/subscription.test.js

@@ -33,7 +33,7 @@ function createWebSocketClient (t, app) {
   return { client, ws }
 }
 
-test('subscription - crud', { only: true }, async t => {
+test('subscription - crud', async t => {
   const app = Fastify()
   t.teardown(() => app.close())
 

package/test/where.test.js

@@ -812,3 +812,291 @@ test('delete all', async ({ pass, teardown, same, equal }) => {
     }, 'posts response')
   }
 })
+
+test('like', 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: 'The dog barks',
+    counter: 10
+  }, {
+    title: 'Cat',
+    longText: 'The cat meows',
+    counter: 20
+  }, {
+    title: 'Mouse',
+    longText: 'The mouse likes cheese',
+    counter: 30
+  }, {
+    title: 'Duck',
+    longText: 'A duck tale',
+    counter: 40
+  }]
+
+  await app.inject({
+    method: 'POST',
+    url: '/graphql',
+    body: {
+      query: `
+          mutation batch($inputs : [PostInput]!) {
+            insertPosts(inputs: $inputs) {
+              id
+              title
+            }
+          }
+        `,
+      variables: {
+        inputs: posts
+      }
+    }
+  })
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'posts status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '1',
+          title: 'Dog',
+          longText: 'The dog barks',
+          counter: 10
+        }, {
+          id: '2',
+          title: 'Cat',
+          longText: 'The cat meows',
+          counter: 20
+        }, {
+          id: '3',
+          title: 'Mouse',
+          longText: 'The mouse likes cheese',
+          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: { longText: { like: "The%" } }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'where: { longText: { like: "The%" } } status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '1',
+          title: 'Dog',
+          longText: 'The dog barks',
+          counter: 10
+        }, {
+          id: '2',
+          title: 'Cat',
+          longText: 'The cat meows',
+          counter: 20
+        }, {
+          id: '3',
+          title: 'Mouse',
+          longText: 'The mouse likes cheese',
+          counter: 30
+        }]
+      }
+    }, 'where: { longText: { like: "The%" } } response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { longText: { like: "%s" } }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'where: { longText: { like: "%s" } } status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '1',
+          title: 'Dog',
+          longText: 'The dog barks',
+          counter: 10
+        }, {
+          id: '2',
+          title: 'Cat',
+          longText: 'The cat meows',
+          counter: 20
+        }]
+      }
+    }, 'where: { longText: { like: "%s" } } response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { longText: { like: "%o%" } }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'where: { longText: { like: "%o%" } } status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '1',
+          title: 'Dog',
+          longText: 'The dog barks',
+          counter: 10
+        }, {
+          id: '2',
+          title: 'Cat',
+          longText: 'The cat meows',
+          counter: 20
+        }, {
+          id: '3',
+          title: 'Mouse',
+          longText: 'The mouse likes cheese',
+          counter: 30
+        }]
+      }
+    }, 'where: { longText: { like: "%o%" } } response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { counter: { like: 10 } }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'where: { counter: { like: 10 } } status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '1',
+          title: 'Dog',
+          longText: 'The dog barks',
+          counter: 10
+        }]
+      }
+    }, 'where: { counter: { like: 10 } } response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            posts(where: { counter: { like: 40 } }) {
+              id
+              title
+              longText
+              counter
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'where: { counter: { like: 40 } } status code')
+    same(res.json(), {
+      data: {
+        posts: [{
+          id: '4',
+          title: 'Duck',
+          longText: 'A duck tale',
+          counter: 40
+        }]
+      }
+    }, 'where: { counter: { like: 40 } } response')
+  }
+})