@platformatic/sql-graphql 0.14.0 → 0.15.0

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.14.0",
+  "version": "0.15.0",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "repository": {
@@ -21,8 +21,8 @@
     "tap": "^16.3.2",
     "tsd": "^0.25.0",
     "ws": "^8.11.0",
-    "@platformatic/sql-events": "0.14.0",
-    "@platformatic/sql-mapper": "0.14.0"
+    "@platformatic/sql-events": "0.15.0",
+    "@platformatic/sql-mapper": "0.15.0"
   },
   "dependencies": {
     "@mercuriusjs/federation": "^1.0.0",
@@ -38,7 +38,7 @@
     "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/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'
+          }]
+        }
+      }
+    })
+  }
+})