@platformatic/sql-graphql 0.13.1 → 0.15.0

package/index.js

@@ -4,6 +4,7 @@ const fp = require('fastify-plugin')
 const constructGraph = require('./lib/entity-to-type')
 const mercurius = require('mercurius')
 const graphql = require('graphql')
+const { mercuriusFederationPlugin } = require('@mercuriusjs/federation')
 const establishRelations = require('./lib/relationship')
 const setupSubscriptions = require('./lib/subscriptions')
 const scalars = require('graphql-scalars')
@@ -156,7 +157,12 @@ async function mapperToGraphql (app, opts) {
 
   opts.graphiql = opts.graphiql !== false
 
-  await app.register(mercurius, {
+  let plugin = mercurius
+  if (opts.federationMetadata) {
+    plugin = mercuriusFederationPlugin
+  }
+
+  await app.register(plugin, {
     ...opts,
     schema: sdl,
     loaders,

package/lib/relationship.js

@@ -34,7 +34,7 @@ module.exports = function establishRelations (app, relations, resolvers, loaders
         const originalField = camelcase(column_name)
         delete current.fields[originalField]
         current.fields[lowered] = { type: foreign.type }
-        loaders[current.type] = loaders[current.type] || resolvers[current.type] || {}
+        loaders[current.type] = loaders[current.type] || {}
         const key = camelcase(foreign_column_name)
         loaders[current.type][lowered] = {
           loader (queries, ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "repository": {
@@ -14,29 +14,31 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
+    "@mercuriusjs/gateway": "^1.0.0",
     "fastify": "^4.10.2",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.3.2",
     "tsd": "^0.25.0",
     "ws": "^8.11.0",
-    "@platformatic/sql-events": "0.13.1",
-    "@platformatic/sql-mapper": "0.13.1"
+    "@platformatic/sql-events": "0.15.0",
+    "@platformatic/sql-mapper": "0.15.0"
   },
   "dependencies": {
+    "@mercuriusjs/federation": "^1.0.0",
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.4.0",
     "graphql": "^16.6.0",
     "graphql-scalars": "^1.20.1",
     "graphql-type-json": "^0.3.2",
     "inflected": "^2.1.0",
-    "mercurius": "^11.4.0"
+    "mercurius": "^12.0.0"
   },
   "tsd": {
     "directory": "test/types"
   },
   "scripts": {
-    "lint": "standard",
+    "lint": "standard | snazzy",
     "test": "standard | snazzy && npm run test:typescript && npm run test:postgresql && npm run test:mariadb && npm run test:mysql && npm run test:mysql8 && npm run test:sqlite",
     "test:postgresql": "DB=postgresql tap test/*.test.js",
     "test:mariadb": "DB=mariadb tap test/*.test.js",

package/test/datatypes.test.js

@@ -723,7 +723,7 @@ test('[SQLite] - UUID', { skip: !isSQLite }, async ({ pass, teardown, same, equa
   }
 })
 
-test('BIGINT!', { skip: isSQLite, only: true }, async ({ pass, teardown, same, equal }) => {
+test('BIGINT!', { skip: isSQLite }, async ({ pass, teardown, same, equal }) => {
   const app = fastify()
   app.register(sqlMapper, {
     ...connInfo,

package/test/federation.test.js

@@ -2,17 +2,17 @@
 
 const { test } = require('tap')
 const Fastify = require('fastify')
-const mercurius = require('mercurius')
+const Gateway = require('@mercuriusjs/gateway')
+const { mercuriusFederationPlugin } = require('@mercuriusjs/federation')
 const sqlGraphQL = require('..')
 const sqlMapper = require('@platformatic/sql-mapper')
 const { clear, connInfo, isSQLite } = require('./helper')
 
 async function createTestService (t, schema, resolvers = {}) {
   const service = Fastify({ logger: { level: 'error' } })
-  service.register(mercurius, {
+  service.register(mercuriusFederationPlugin, {
     schema,
-    resolvers,
-    federationMetadata: true
+    resolvers
   })
   await service.listen({ port: 0 })
   return [service, service.server.address().port]
@@ -155,7 +155,7 @@ async function createTestGatewayServer (t, cacheOpts) {
     await categoryService.close()
     await postService.close()
   })
-  gateway.register(mercurius, {
+  gateway.register(Gateway, {
     gateway: {
       services: [{
         name: 'category',

package/test/helper.js

@@ -40,9 +40,18 @@ module.exports.clear = async function (db, sql) {
   } catch (err) {
   }
 
+  try {
+    await db.query(sql`DROP TABLE books`)
+  } catch (err) {
+  }
+  try {
+    await db.query(sql`DROP TABLE authors`)
+  } catch (err) {
+  }
+
   try {
     await db.query(sql`DROP TABLE categories`)
-  } catch {
+  } catch (err) {
   }
 
   try {
@@ -74,15 +83,6 @@ module.exports.clear = async function (db, sql) {
   } catch {
   }
 
-  try {
-    await db.query(sql`DROP TABLE books`)
-  } catch (err) {
-  }
-  try {
-    await db.query(sql`DROP TABLE authors`)
-  } catch (err) {
-  }
-
   try {
     await db.query(sql`DROP TABLE organizations`)
   } catch (err) {

package/test/relations.test.js

@@ -384,3 +384,200 @@ test('cut out id exactly from ending when forming a name of relation', async ({
     }, 'query organization response')
   }
 })
+
+test('should handle reads from save', { only: true }, async ({ pass, teardown, same, equal }) => {
+  const app = fastify({ logger: false })
+  app.register(sqlMapper, {
+    ...connInfo,
+    async onDatabaseLoad (db, sql) {
+      pass('onDatabaseLoad called')
+
+      await clear(db, sql)
+
+      if (isMysql) {
+        await db.query(sql`
+          CREATE TABLE categories (
+            id SERIAL PRIMARY KEY,
+            name VARCHAR(255)
+          );
+          CREATE TABLE authors (
+            id SERIAL PRIMARY KEY,
+            name VARCHAR(255),
+            category_id BIGINT UNSIGNED,
+            FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE
+          );
+          CREATE TABLE books (
+            id SERIAL PRIMARY KEY,
+            title VARCHAR(42),
+            author_id BIGINT UNSIGNED,
+            category_id BIGINT UNSIGNED,
+            FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE,
+            FOREIGN KEY (author_id) REFERENCES authors(id) ON DELETE CASCADE
+          );
+        `)
+      } else if (isSQLite) {
+        await db.query(sql`
+          CREATE TABLE categories (
+            id INTEGER PRIMARY KEY,
+            name VARCHAR(255)
+          );
+        `)
+        await db.query(sql`
+          CREATE TABLE authors (
+            id INTEGER PRIMARY KEY,
+            name VARCHAR(255),
+            category_id BIGINT UNSIGNED,
+            FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE
+          );
+        `)
+        await db.query(sql`
+          CREATE TABLE books (
+            id INTEGER PRIMARY KEY,
+            title VARCHAR(42),
+            author_id BIGINT UNSIGNED,
+            category_id BIGINT UNSIGNED,
+            FOREIGN KEY (category_id) REFERENCES categories(id) ON DELETE CASCADE,
+            FOREIGN KEY (author_id) REFERENCES authors(id) ON DELETE CASCADE
+          );
+        `)
+      } else {
+        await db.query(sql`
+          CREATE TABLE categories (
+            id SERIAL PRIMARY KEY,
+            name VARCHAR(42)
+          );
+
+          CREATE TABLE authors (
+            id SERIAL PRIMARY KEY,
+            name VARCHAR(42),
+            category_id INTEGER REFERENCES categories(id)
+          );
+
+          CREATE TABLE books (
+            id SERIAL PRIMARY KEY,
+            title VARCHAR(42),
+            category_id INTEGER REFERENCES categories(id),
+            author_id INTEGER REFERENCES authors(id)
+          );
+        `)
+      }
+    }
+  })
+  app.register(sqlGraphQL)
+  teardown(app.close.bind(app))
+
+  await app.ready()
+
+  const categories = [{
+    name: 'Sci-Fi'
+  }]
+
+  const authors = [{
+    name: 'Mark',
+    categoryId: 1
+  }]
+
+  const books = [{
+    title: 'Harry',
+    authorId: 1,
+    categoryId: 1
+  }]
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+            mutation batch($inputs : [CategoryInput]!) {
+              insertCategories(inputs: $inputs) {
+                id
+                name
+              }
+            }
+          `,
+        variables: {
+          inputs: categories
+        }
+      }
+    })
+    equal(res.statusCode, 200, 'categories status code')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+            mutation batch($inputs : [AuthorInput]!) {
+              insertAuthors(inputs: $inputs) {
+                id
+                name
+              }
+            }
+          `,
+        variables: {
+          inputs: authors
+        }
+      }
+    })
+    equal(res.statusCode, 200, 'authors status code')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+            mutation batch($inputs : [BookInput]!) {
+              insertBooks(inputs: $inputs) {
+                id
+                title
+              }
+            }
+          `,
+        variables: {
+          inputs: books
+        }
+      }
+    })
+    equal(res.statusCode, 200, 'books status code')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+            mutation {
+              saveAuthor(input: { id: 1, name: "Mark II" }) {
+                id
+                books {
+                  id
+                  title
+                }
+              }
+            }
+          `,
+        variables: {
+          inputs: books
+        }
+      }
+    })
+    equal(res.statusCode, 200, 'books status code')
+    same(res.json(), {
+      data: {
+        saveAuthor: {
+          id: 1,
+          books: [{
+            id: 1,
+            title: 'Harry'
+          }]
+        }
+      }
+    })
+  }
+})