@platformatic/sql-graphql 0.6.0 → 0.7.0

package/lib/entity-to-type.js

@@ -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

package/lib/relationship.js

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint camelcase: 0 */
+
 const camelcase = require('camelcase')
 const {
   fromSelectionSet
@@ -13,21 +15,23 @@ 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 } 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] || {}
         loaders[current.type][lowered] = {
@@ -52,9 +56,9 @@ module.exports = function establishRelations (app, relations, resolvers, loaders
         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/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "0.6.0",
+  "version": "0.7.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.0",
-    "@platformatic/sql-mapper": "0.6.0",
+    "@platformatic/sql-events": "0.7.0",
+    "@platformatic/sql-mapper": "0.7.0",
     "fastify": "^4.6.0",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",

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

@@ -86,4 +86,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) {
+  }
 }