@graffy/pg 0.16.3-alpha.5 → 0.16.3-alpha.7

package/index.cjs

@@ -591,14 +591,24 @@ class Db {
       this.client = new Pool(connection);
     }
   }
-  async query(sql2) {
+  async query(sql2, tableOptions) {
+    var _a, _b;
     log(`Making SQL query: ${sql2.text}`, sql2.values);
+    const cubeOid = parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
           if (oid === types.builtins.INT8) {
             return (value) => parseInt(value, 10);
           }
+          if (oid === cubeOid) {
+            return (value) => {
+              const array = value.slice(1, -1).split(/\)\s*,\s*\(/).map(
+                (corner) => corner.split(",").map((coord) => parseFloat(coord.trim()))
+              );
+              return array.length > 1 ? array : array[0];
+            };
+          }
           return types.getTypeParser(oid, format);
         }
       };
@@ -615,13 +625,13 @@ class Db {
       throw Error(`pg.sql_error ${message}`);
     }
   }
-  async readSql(sql2) {
-    const result = (await this.query(sql2)).rows;
+  async readSql(sql2, tableOptions) {
+    const result = (await this.query(sql2, tableOptions)).rows;
     log("Read result", result);
     return result;
   }
-  async writeSql(sql2) {
-    const res = await this.query(sql2);
+  async writeSql(sql2, tableOptions) {
+    const res = await this.query(sql2, tableOptions);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
       throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
@@ -646,6 +656,10 @@ class Db {
           table_schema = ${tableSchema}`)).rows[0].column_types;
     if (!types2)
       throw Error(`pg.missing_table ${table}`);
+    const typeOids = (await this.query(sql`
+        SELECT jsonb_object_agg(typname, oid) AS type_oids
+        FROM pg_type
+        WHERE typname = 'cube'`)).rows[0].type_oids;
     const verDefault = (await this.query(sql`
         SELECT column_default
         FROM information_schema.columns
@@ -657,7 +671,7 @@ class Db {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }
     log("ensureSchema", types2);
-    tableOptions.schema = { types: types2 };
+    tableOptions.schema = { types: types2, typeOids };
     tableOptions.verDefault = verDefault;
   }
   async read(rootQuery, tableOptions) {
@@ -669,7 +683,8 @@ class Db {
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(
-        selectByArgs(args, projection, tableOptions)
+        selectByArgs(args, projection, tableOptions),
+        tableOptions
       );
       const wrappedGraph = common.encodeGraph(common.wrapObject(result, rawPrefix));
       log("getByArgs", wrappedGraph);
@@ -677,7 +692,8 @@ class Db {
     };
     const getByIds = async () => {
       const result = await this.readSql(
-        selectByIds(Object.keys(idQueries), null, tableOptions)
+        selectByIds(Object.keys(idQueries), null, tableOptions),
+        tableOptions
       );
       result.forEach((object) => {
         const wrappedGraph = common.encodeGraph(common.wrapObject(object, rawPrefix));
@@ -735,7 +751,7 @@ class Db {
     const result = [];
     await Promise.all(
       sqls.map(
-        (sql2) => this.writeSql(sql2).then((object) => {
+        (sql2) => this.writeSql(sql2, tableOptions).then((object) => {
           common.merge(result, common.encodeGraph(common.wrapObject(object, rawPrefix)));
         })
       )

package/index.mjs

@@ -589,14 +589,24 @@ class Db {
       this.client = new Pool(connection);
     }
   }
-  async query(sql2) {
+  async query(sql2, tableOptions) {
+    var _a, _b;
     log(`Making SQL query: ${sql2.text}`, sql2.values);
+    const cubeOid = parseInt(((_b = (_a = tableOptions == null ? void 0 : tableOptions.schema) == null ? void 0 : _a.typeOids) == null ? void 0 : _b.cube) || "0") || null;
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
           if (oid === types.builtins.INT8) {
             return (value) => parseInt(value, 10);
           }
+          if (oid === cubeOid) {
+            return (value) => {
+              const array = value.slice(1, -1).split(/\)\s*,\s*\(/).map(
+                (corner) => corner.split(",").map((coord) => parseFloat(coord.trim()))
+              );
+              return array.length > 1 ? array : array[0];
+            };
+          }
           return types.getTypeParser(oid, format);
         }
       };
@@ -613,13 +623,13 @@ class Db {
       throw Error(`pg.sql_error ${message}`);
     }
   }
-  async readSql(sql2) {
-    const result = (await this.query(sql2)).rows;
+  async readSql(sql2, tableOptions) {
+    const result = (await this.query(sql2, tableOptions)).rows;
     log("Read result", result);
     return result;
   }
-  async writeSql(sql2) {
-    const res = await this.query(sql2);
+  async writeSql(sql2, tableOptions) {
+    const res = await this.query(sql2, tableOptions);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
       throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
@@ -644,6 +654,10 @@ class Db {
           table_schema = ${tableSchema}`)).rows[0].column_types;
     if (!types2)
       throw Error(`pg.missing_table ${table}`);
+    const typeOids = (await this.query(sql`
+        SELECT jsonb_object_agg(typname, oid) AS type_oids
+        FROM pg_type
+        WHERE typname = 'cube'`)).rows[0].type_oids;
     const verDefault = (await this.query(sql`
         SELECT column_default
         FROM information_schema.columns
@@ -655,7 +669,7 @@ class Db {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }
     log("ensureSchema", types2);
-    tableOptions.schema = { types: types2 };
+    tableOptions.schema = { types: types2, typeOids };
     tableOptions.verDefault = verDefault;
   }
   async read(rootQuery, tableOptions) {
@@ -667,7 +681,8 @@ class Db {
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(
-        selectByArgs(args, projection, tableOptions)
+        selectByArgs(args, projection, tableOptions),
+        tableOptions
       );
       const wrappedGraph = encodeGraph(wrapObject(result, rawPrefix));
       log("getByArgs", wrappedGraph);
@@ -675,7 +690,8 @@ class Db {
     };
     const getByIds = async () => {
       const result = await this.readSql(
-        selectByIds(Object.keys(idQueries), null, tableOptions)
+        selectByIds(Object.keys(idQueries), null, tableOptions),
+        tableOptions
       );
       result.forEach((object) => {
         const wrappedGraph = encodeGraph(wrapObject(object, rawPrefix));
@@ -733,7 +749,7 @@ class Db {
     const result = [];
     await Promise.all(
       sqls.map(
-        (sql2) => this.writeSql(sql2).then((object) => {
+        (sql2) => this.writeSql(sql2, tableOptions).then((object) => {
           merge(result, encodeGraph(wrapObject(object, rawPrefix)));
         })
       )

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/pg",
   "description": "The standard Postgres module for Graffy. Each instance this module mounts a Postgres table as a Graffy subtree.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.16.3-alpha.5",
+  "version": "0.16.3-alpha.7",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.3-alpha.5",
+    "@graffy/common": "0.16.3-alpha.7",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

package/types/Db.d.ts

@@ -1,9 +1,9 @@
 export default class Db {
     constructor(connection: any);
     client: any;
-    query(sql: any): Promise<any>;
-    readSql(sql: any): Promise<any>;
-    writeSql(sql: any): Promise<any>;
+    query(sql: any, tableOptions: any): Promise<any>;
+    readSql(sql: any, tableOptions: any): Promise<any>;
+    writeSql(sql: any, tableOptions: any): Promise<any>;
     ensureSchema(tableOptions: any): Promise<void>;
     read(rootQuery: any, tableOptions: any): Promise<any>;
     write(rootChange: any, tableOptions: any): Promise<any[]>;