@platformatic/sql-graphql 0.31.1 → 0.33.0

package/README.md

@@ -1,6 +1,6 @@
 # @platformatic/sql-graphql
 
-Check out the full documentation on [our website](https://oss.platformatic.dev/docs/reference/sql-graphql/queries).
+Check out the full documentation on [our website](https://docs.platformatic.dev/docs/reference/sql-graphql/queries).
 
 ## Install
 

package/lib/entity-to-type.js

@@ -47,8 +47,12 @@ function constructGraph (app, entity, opts, ignore) {
     const meta = { field }
 
     // sqlite doesn't support enums
+    // PG does support Arrays as columns
     /* istanbul ignore next */
-    if (field.enum) {
+    if (field.isArray) {
+      const listType = sqlTypeToGraphQL(field.sqlType)
+      meta.type = new graphql.GraphQLList(listType)
+    } else if (field.enum) {
       const enumValues = field.enum.reduce((acc, enumValue, index) => {
         let key = enumValue.replace(/[^\w\s]/g, '_')
 
@@ -100,20 +104,30 @@ function constructGraph (app, entity, opts, ignore) {
   }).flat())].join('_'))
 
   const whereFields = Object.keys(fields).reduce((acc, field) => {
+    let graphqlFields
+    /* istanbul ignore else */
+    if (!fields[field].field.isArray) {
+      graphqlFields = {
+        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) }
+      }
+    } else {
+      graphqlFields = {
+        any: { type: fields[field].type.ofType },
+        all: { type: fields[field].type.ofType }
+      }
+    }
     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) }
-        }
+        fields: graphqlFields
       })
     }
     return acc
@@ -163,8 +177,11 @@ function constructGraph (app, entity, opts, ignore) {
   const orderByFields = new graphql.GraphQLEnumType({
     name: `${entityName}OrderByField`,
     values: Object.keys(fields).reduce((acc, field) => {
-      acc[field] = {
-        value: field
+      /* istanbul ignore else */
+      if (!fields[field].isArray) {
+        acc[field] = {
+          value: field
+        }
       }
       return acc
     }, {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "0.31.1",
+  "version": "0.33.0",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "types": "index.d.ts",
@@ -22,8 +22,8 @@
     "tap": "^16.3.6",
     "tsd": "^0.28.1",
     "ws": "^8.13.0",
-    "@platformatic/sql-events": "0.31.1",
-    "@platformatic/sql-mapper": "0.31.1"
+    "@platformatic/sql-events": "0.33.0",
+    "@platformatic/sql-mapper": "0.33.0"
   },
   "dependencies": {
     "@mercuriusjs/federation": "^2.0.0",

package/test/array.test.js

@@ -0,0 +1,216 @@
+'use strict'
+
+const { test } = require('tap')
+const sqlGraphQL = require('..')
+const sqlMapper = require('@platformatic/sql-mapper')
+const fastify = require('fastify')
+const { clear, connInfo, isPg } = require('./helper')
+
+test('array support', { skip: !isPg }, async ({ pass, teardown, same, equal }) => {
+  const app = fastify()
+  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(42) NOT NULL,
+      tags VARCHAR(42)[] NOT NULL
+    );`)
+    }
+  })
+  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: { title: "Hello", tags: ["foo", "bar"] }) {
+              id
+              title
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'savePage status code')
+    same(res.json(), {
+      data: {
+        savePage: {
+          id: 1,
+          title: 'Hello',
+          tags: ['foo', 'bar']
+        }
+      }
+    }, 'savePage response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            getPageById(id: 1) {
+              id
+              title,
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'pages status code')
+    same(res.json(), {
+      data: {
+        getPageById: {
+          id: 1,
+          title: 'Hello',
+          tags: ['foo', 'bar']
+        }
+      }
+    }, 'pages response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            pages(where: { tags: { any: "foo" } }) {
+              id
+              title
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'pages status code')
+    same(res.json(), {
+      data: {
+        pages: [{
+          id: 1,
+          title: 'Hello',
+          tags: ['foo', 'bar']
+        }]
+      }
+    }, 'pages response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            pages(where: { tags: { any: "baz" } }) {
+              id
+              title,
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'pages status code')
+    same(res.json(), {
+      data: {
+        pages: []
+      }
+    }, 'pages response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            pages(where: { tags: { all: "foo" } }) {
+              id
+              title,
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'pages status code')
+    same(res.json(), {
+      data: {
+        pages: []
+      }
+    }, 'pages response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          mutation {
+            savePage(input: { id: 1, title: "Hello World", tags: ["foo", "bar", "baz"] }) {
+              id
+              title
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'savePage status code')
+    same(res.json(), {
+      data: {
+        savePage: {
+          id: 1,
+          title: 'Hello World',
+          tags: ['foo', 'bar', 'baz']
+        }
+      }
+    }, 'savePage response')
+  }
+
+  {
+    const res = await app.inject({
+      method: 'POST',
+      url: '/graphql',
+      body: {
+        query: `
+          query {
+            getPageById(id: 1) {
+              id
+              title
+              tags
+            }
+          }
+        `
+      }
+    })
+    equal(res.statusCode, 200, 'pages status code')
+    same(res.json(), {
+      data: {
+        getPageById: {
+          id: 1,
+          title: 'Hello World',
+          tags: ['foo', 'bar', 'baz']
+        }
+      }
+    }, 'pages response')
+  }
+})