@nymphjs/driver-postgresql 1.0.0-beta.76 → 1.0.0-beta.78

package/src/PostgreSQLDriver.ts

@@ -84,8 +84,8 @@ export default class PostgreSQLDriver extends NymphDriver {
 
   static unescapeNulls(input: string) {
     return input
-      .replace(/\uFFFD\uFFFD/g, () => '\uFFFD')
-      .replace(/-\uFFFD-/g, () => '\x00');
+      .replace(/-\uFFFD-/g, () => '\x00')
+      .replace(/\uFFFD\uFFFD/g, () => '\uFFFD');
   }
 
   constructor(
@@ -312,6 +312,9 @@ export default class PostgreSQLDriver extends NymphDriver {
           "name" TEXT NOT NULL,
           "value" CHARACTER(1) NOT NULL,
           "json" JSONB,
+          "string" TEXT,
+          "number" DOUBLE PRECISION,
+          "truthy" BOOLEAN,
           PRIMARY KEY ("guid", "name"),
           FOREIGN KEY ("guid")
             REFERENCES ${PostgreSQLDriver.escape(
@@ -342,16 +345,16 @@ export default class PostgreSQLDriver extends NymphDriver {
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_name`,
+          `${this.prefix}data_${etype}_id_guid_name`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_name`,
+          `${this.prefix}data_${etype}_id_guid_name`,
         )} ON ${PostgreSQLDriver.escape(
           `${this.prefix}data_${etype}`,
-        )} USING btree ("name");`,
+        )} USING btree ("guid", "name");`,
         { connection },
       );
       await this.queryRun(
@@ -384,146 +387,100 @@ export default class PostgreSQLDriver extends NymphDriver {
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_name_value`,
+          `${this.prefix}data_${etype}_id_name`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_name_value`,
+          `${this.prefix}data_${etype}_id_name`,
         )} ON ${PostgreSQLDriver.escape(
           `${this.prefix}data_${etype}`,
-        )} USING btree ("name", "value");`,
+        )} USING btree ("name");`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_json`,
+          `${this.prefix}data_${etype}_id_name_string`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}data_${etype}_id_json`,
+          `${this.prefix}data_${etype}_id_name_string`,
         )} ON ${PostgreSQLDriver.escape(
           `${this.prefix}data_${etype}`,
-        )} USING gin ("json");`,
-        { connection },
-      );
-      // Create the data comparisons table.
-      await this.queryRun(
-        `CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} (
-          "guid" BYTEA NOT NULL,
-          "name" TEXT NOT NULL,
-          "truthy" BOOLEAN,
-          "string" TEXT,
-          "number" DOUBLE PRECISION,
-          PRIMARY KEY ("guid", "name"),
-          FOREIGN KEY ("guid")
-            REFERENCES ${PostgreSQLDriver.escape(
-              `${this.prefix}entities_${etype}`,
-            )} ("guid") MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE
-        ) WITH ( OIDS=FALSE );`,
-        { connection },
-      );
-      await this.queryRun(
-        `ALTER TABLE ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`,
-        { connection },
-      );
-      await this.queryRun(
-        `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_guid`,
-        )};`,
-        { connection },
-      );
-      await this.queryRun(
-        `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_guid`,
-        )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} USING btree ("guid");`,
+        )} USING btree ("name", LEFT("string", 512));`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name`,
+          `${this.prefix}data_${etype}_id_name_number`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name`,
+          `${this.prefix}data_${etype}_id_name_number`,
         )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} USING btree ("name");`,
+          `${this.prefix}data_${etype}`,
+        )} USING btree ("name", "number");`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_truthy`,
+          `${this.prefix}data_${etype}_id_name_truthy`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_truthy`,
+          `${this.prefix}data_${etype}_id_name_truthy`,
         )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
+          `${this.prefix}data_${etype}`,
         )} USING btree ("name") WHERE "truthy" = TRUE;`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_falsy`,
+          `${this.prefix}data_${etype}_id_name_falsy`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_falsy`,
+          `${this.prefix}data_${etype}_id_name_falsy`,
         )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
+          `${this.prefix}data_${etype}`,
         )} USING btree ("name") WHERE "truthy" <> TRUE;`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_string`,
+          `${this.prefix}data_${etype}_id_string`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_string`,
-        )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} USING btree ("name", LEFT("string", 512));`,
-        { connection },
-      );
-      await this.queryRun(
-        `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_stringgin`,
+          `${this.prefix}data_${etype}_id_string`,
         )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
+          `${this.prefix}data_${etype}`,
         )} USING gin ("string" gin_trgm_ops);`,
         { connection },
       );
       await this.queryRun(
         `DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_number`,
+          `${this.prefix}data_${etype}_id_json`,
         )};`,
         { connection },
       );
       await this.queryRun(
         `CREATE INDEX ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}_id_name_number`,
+          `${this.prefix}data_${etype}_id_json`,
         )} ON ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} USING btree ("name", "number");`,
+          `${this.prefix}data_${etype}`,
+        )} USING gin ("json");`,
         { connection },
       );
       // Create the references table.
@@ -861,17 +818,6 @@ export default class PostgreSQLDriver extends NymphDriver {
           },
         },
       );
-      await this.queryRun(
-        `DELETE FROM ${PostgreSQLDriver.escape(
-          `${this.prefix}comparisons_${etype}`,
-        )} WHERE "guid"=decode(@guid, 'hex');`,
-        {
-          etypes: [etype],
-          params: {
-            guid,
-          },
-        },
-      );
       await this.queryRun(
         `DELETE FROM ${PostgreSQLDriver.escape(
           `${this.prefix}references_${etype}`,
@@ -988,28 +934,28 @@ export default class PostgreSQLDriver extends NymphDriver {
 
     // Get the etypes.
     const tables = await this.queryIter(
-      'SELECT relname FROM pg_stat_user_tables ORDER BY relname;',
+      'SELECT "table_name" AS "table_name" FROM "information_schema"."tables" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name" LIKE @prefix;',
+      {
+        params: {
+          db: this.config.database,
+          prefix: this.prefix + 'entities_' + '%',
+        },
+      },
     );
     const etypes = [];
-    for (const tableRow of tables) {
-      const table = tableRow.relname;
-      if (table.startsWith(this.prefix + 'entities_')) {
-        etypes.push(table.substr((this.prefix + 'entities_').length));
-      }
+    for (const table of tables) {
+      etypes.push(table.table_name.substr((this.prefix + 'entities_').length));
     }
 
     for (const etype of etypes) {
       // Export entities.
       const dataIterator = (
         await this.queryIter(
-          `SELECT encode(e."guid", 'hex') AS "guid", e."tags", e."cdate", e."mdate", d."name" AS "dname", d."value" AS "dvalue", d."json" AS "djson", c."string", c."number"
+          `SELECT encode(e."guid", 'hex') AS "guid", e."tags", e."cdate", e."mdate", d."name", d."value", d."json", d."string", d."number"
           FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} e
           LEFT JOIN ${PostgreSQLDriver.escape(
             `${this.prefix}data_${etype}`,
           )} d ON e."guid"=d."guid"
-          INNER JOIN ${PostgreSQLDriver.escape(
-            `${this.prefix}comparisons_${etype}`,
-          )} c ON d."guid"=c."guid" AND d."name"=c."name"
           ORDER BY e."guid";`,
         )
       )[Symbol.iterator]();
@@ -1023,23 +969,23 @@ export default class PostgreSQLDriver extends NymphDriver {
         currentEntityExport.push(`{${guid}}<${etype}>[${tags}]`);
         currentEntityExport.push(`\tcdate=${JSON.stringify(cdate)}`);
         currentEntityExport.push(`\tmdate=${JSON.stringify(mdate)}`);
-        if (datum.value.dname != null) {
+        if (datum.value.name != null) {
           // This do will keep going and adding the data until the
           // next entity is reached. $row will end on the next entity.
           do {
             const value =
-              datum.value.dvalue === 'N'
+              datum.value.value === 'N'
                 ? JSON.stringify(Number(datum.value.number))
-                : datum.value.dvalue === 'S'
+                : datum.value.value === 'S'
                 ? JSON.stringify(
                     PostgreSQLDriver.unescapeNulls(datum.value.string),
                   )
-                : datum.value.dvalue === 'J'
+                : datum.value.value === 'J'
                 ? PostgreSQLDriver.unescapeNullSequences(
-                    JSON.stringify(datum.value.djson),
+                    JSON.stringify(datum.value.json),
                   )
-                : datum.value.dvalue;
-            currentEntityExport.push(`\t${datum.value.dname}=${value}`);
+                : datum.value.value;
+            currentEntityExport.push(`\t${datum.value.name}=${value}`);
             datum = dataIterator.next();
           } while (!datum.done && datum.value.guid === guid);
         } else {
@@ -1081,7 +1027,6 @@ export default class PostgreSQLDriver extends NymphDriver {
     }
     const eTable = `e${tableSuffix}`;
     const dTable = `d${tableSuffix}`;
-    const cTable = `c${tableSuffix}`;
     const fTable = `f${tableSuffix}`;
     const ieTable = `ie${tableSuffix}`;
     const countTable = `count${tableSuffix}`;
@@ -1169,9 +1114,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                   curQuery +=
                     (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                     'EXISTS (SELECT "guid" FROM ' +
-                    PostgreSQLDriver.escape(
-                      this.prefix + 'comparisons_' + etype,
-                    ) +
+                    PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                     ' WHERE "guid"=' +
                     ieTable +
                     '."guid" AND "name"=@' +
@@ -1220,9 +1163,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1241,9 +1182,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1278,7 +1217,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                   ieTable +
                   '."guid" AND "name"=@' +
                   name +
-                  ' AND "json"=' +
+                  ' AND "json"=@' +
                   value +
                   ')';
                 params[name] = curValue[0];
@@ -1295,7 +1234,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."cdate"=' +
+                  '."cdate"=@' +
                   cdate;
                 params[cdate] = isNaN(Number(curValue[1]))
                   ? null
@@ -1309,7 +1248,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   ieTable +
-                  '."mdate"=' +
+                  '."mdate"=@' +
                   mdate;
                 params[mdate] = isNaN(Number(curValue[1]))
                   ? null
@@ -1389,9 +1328,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1442,9 +1379,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1495,9 +1430,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1548,9 +1481,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1601,9 +1532,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1656,9 +1585,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1711,9 +1638,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1766,9 +1691,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                 curQuery +=
                   (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                   'EXISTS (SELECT "guid" FROM ' +
-                  PostgreSQLDriver.escape(
-                    this.prefix + 'comparisons_' + etype,
-                  ) +
+                  PostgreSQLDriver.escape(this.prefix + 'data_' + etype) +
                   ' WHERE "guid"=' +
                   ieTable +
                   '."guid" AND "name"=@' +
@@ -1899,17 +1822,13 @@ export default class PostgreSQLDriver extends NymphDriver {
         const name = `param${++count.i}`;
         sortJoin = `LEFT JOIN (
             SELECT "guid", "string", "number"
-            FROM ${PostgreSQLDriver.escape(
-              this.prefix + 'comparisons_' + etype,
-            )}
+            FROM ${PostgreSQLDriver.escape(this.prefix + 'data_' + etype)}
             WHERE "name"=@${name}
             ORDER BY "number"${order}, "string"${order}
           ) ${sTable} ON ${eTable}."guid"=${sTable}."guid"`;
         sortJoinInner = `LEFT JOIN (
             SELECT "guid", "string", "number"
-            FROM ${PostgreSQLDriver.escape(
-              this.prefix + 'comparisons_' + etype,
-            )}
+            FROM ${PostgreSQLDriver.escape(this.prefix + 'data_' + etype)}
             WHERE "name"=@${name}
             ORDER BY "number"${order}, "string"${order}
           ) ${sTable} ON ${ieTable}."guid"=${sTable}."guid"`;
@@ -1977,17 +1896,14 @@ export default class PostgreSQLDriver extends NymphDriver {
               ${dTable}."name",
               ${dTable}."value",
               ${dTable}."json",
-              ${cTable}."string",
-              ${cTable}."number"
+              ${dTable}."string",
+              ${dTable}."number"
             FROM ${PostgreSQLDriver.escape(
               `${this.prefix}entities_${etype}`,
             )} ${eTable}
             LEFT JOIN ${PostgreSQLDriver.escape(
               `${this.prefix}data_${etype}`,
             )} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-            INNER JOIN ${PostgreSQLDriver.escape(
-              `${this.prefix}comparisons_${etype}`,
-            )} ${cTable} ON ${dTable}."guid"=${cTable}."guid" AND ${dTable}."name"=${cTable}."name"
             ${sortJoin}
             INNER JOIN (
               SELECT ${ieTable}."guid"
@@ -2056,17 +1972,14 @@ export default class PostgreSQLDriver extends NymphDriver {
                 ${dTable}."name",
                 ${dTable}."value",
                 ${dTable}."json",
-                ${cTable}."string",
-                ${cTable}."number"
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${PostgreSQLDriver.escape(
                 `${this.prefix}entities_${etype}`,
               )} ${eTable}
               LEFT JOIN ${PostgreSQLDriver.escape(
                 `${this.prefix}data_${etype}`,
               )} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-              INNER JOIN ${PostgreSQLDriver.escape(
-                `${this.prefix}comparisons_${etype}`,
-              )} ${cTable} ON ${dTable}."guid"=${cTable}."guid" AND ${dTable}."name"=${cTable}."name"
               ${sortJoin}
               INNER JOIN (
                 SELECT ${ieTable}."guid"
@@ -2087,17 +2000,14 @@ export default class PostgreSQLDriver extends NymphDriver {
                 ${dTable}."name",
                 ${dTable}."value",
                 ${dTable}."json",
-                ${cTable}."string",
-                ${cTable}."number"
+                ${dTable}."string",
+                ${dTable}."number"
               FROM ${PostgreSQLDriver.escape(
                 `${this.prefix}entities_${etype}`,
               )} ${eTable}
               LEFT JOIN ${PostgreSQLDriver.escape(
                 `${this.prefix}data_${etype}`,
               )} ${dTable} ON ${eTable}."guid"=${dTable}."guid"
-              INNER JOIN ${PostgreSQLDriver.escape(
-                `${this.prefix}comparisons_${etype}`,
-              )} ${cTable} ON ${dTable}."guid"=${cTable}."guid" AND ${dTable}."name"=${cTable}."name"
               ${sortJoin}
               ${guidSelector ? `WHERE ${eTable}."guid"=${guidSelector}` : ''}
               ORDER BY ${sortBy}, ${eTable}."guid"`;
@@ -2225,38 +2135,11 @@ export default class PostgreSQLDriver extends NymphDriver {
     etype: string;
   }) {
     try {
-      await this.internalTransaction(`nymph-import-entity-${guid}`);
-
-      await this.queryRun(
-        `DELETE FROM ${PostgreSQLDriver.escape(
-          `${this.prefix}entities_${etype}`,
-        )} WHERE "guid"=decode(@guid, 'hex');`,
-        {
-          etypes: [etype],
-          params: {
-            guid,
-          },
-        },
-      );
-      await this.queryRun(
-        `INSERT INTO ${PostgreSQLDriver.escape(
-          `${this.prefix}entities_${etype}`,
-        )} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate);`,
-        {
-          etypes: [etype],
-          params: {
-            guid,
-            tags,
-            cdate: isNaN(cdate) ? null : cdate,
-            mdate: isNaN(mdate) ? null : mdate,
-          },
-        },
-      );
-      const promises = [];
+      let promises = [];
       promises.push(
         this.queryRun(
           `DELETE FROM ${PostgreSQLDriver.escape(
-            `${this.prefix}data_${etype}`,
+            `${this.prefix}entities_${etype}`,
           )} WHERE "guid"=decode(@guid, 'hex');`,
           {
             etypes: [etype],
@@ -2269,7 +2152,7 @@ export default class PostgreSQLDriver extends NymphDriver {
       promises.push(
         this.queryRun(
           `DELETE FROM ${PostgreSQLDriver.escape(
-            `${this.prefix}comparisons_${etype}`,
+            `${this.prefix}data_${etype}`,
           )} WHERE "guid"=decode(@guid, 'hex');`,
           {
             etypes: [etype],
@@ -2306,6 +2189,21 @@ export default class PostgreSQLDriver extends NymphDriver {
         ),
       );
       await Promise.all(promises);
+      promises = [];
+      await this.queryRun(
+        `INSERT INTO ${PostgreSQLDriver.escape(
+          `${this.prefix}entities_${etype}`,
+        )} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate);`,
+        {
+          etypes: [etype],
+          params: {
+            guid,
+            tags,
+            cdate: isNaN(cdate) ? null : cdate,
+            mdate: isNaN(mdate) ? null : mdate,
+          },
+        },
+      );
       for (const name in sdata) {
         const value = sdata[name];
         const uvalue = JSON.parse(value);
@@ -2322,12 +2220,11 @@ export default class PostgreSQLDriver extends NymphDriver {
           storageValue === 'J'
             ? PostgreSQLDriver.escapeNullSequences(value)
             : null;
-        const promises = [];
         promises.push(
           this.queryRun(
             `INSERT INTO ${PostgreSQLDriver.escape(
               `${this.prefix}data_${etype}`,
-            )} ("guid", "name", "value", "json") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue);`,
+            )} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue, @string, @number, @truthy);`,
             {
               etypes: [etype],
               params: {
@@ -2335,26 +2232,12 @@ export default class PostgreSQLDriver extends NymphDriver {
                 name,
                 storageValue,
                 jsonValue,
-              },
-            },
-          ),
-        );
-        promises.push(
-          this.queryRun(
-            `INSERT INTO ${PostgreSQLDriver.escape(
-              `${this.prefix}comparisons_${etype}`,
-            )} ("guid", "name", "truthy", "string", "number") VALUES (decode(@guid, 'hex'), @name, @truthy, @string, @number);`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-                name,
-                truthy: !!uvalue,
                 string:
                   storageValue === 'J'
                     ? null
                     : PostgreSQLDriver.escapeNulls(`${uvalue}`),
                 number: isNaN(Number(uvalue)) ? null : Number(uvalue),
+                truthy: !!uvalue,
               },
             },
           ),
@@ -2406,10 +2289,8 @@ export default class PostgreSQLDriver extends NymphDriver {
         );
       }
       await Promise.all(promises);
-      await this.commit(`nymph-import-entity-${guid}`);
     } catch (e: any) {
       this.nymph.config.debugError('postgresql', `Import entity error: "${e}"`);
-      await this.rollback(`nymph-import-entity-${guid}`);
       throw e;
     }
   }
@@ -2573,7 +2454,7 @@ export default class PostgreSQLDriver extends NymphDriver {
           this.queryRun(
             `INSERT INTO ${PostgreSQLDriver.escape(
               `${this.prefix}data_${etype}`,
-            )} ("guid", "name", "value", "json") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue);`,
+            )} ("guid", "name", "value", "json", "string", "number", "truthy") VALUES (decode(@guid, 'hex'), @name, @storageValue, @jsonValue, @string, @number, @truthy);`,
             {
               etypes: [etype],
               params: {
@@ -2581,26 +2462,12 @@ export default class PostgreSQLDriver extends NymphDriver {
                 name,
                 storageValue,
                 jsonValue,
-              },
-            },
-          ),
-        );
-        promises.push(
-          this.queryRun(
-            `INSERT INTO ${PostgreSQLDriver.escape(
-              `${this.prefix}comparisons_${etype}`,
-            )} ("guid", "name", "truthy", "string", "number") VALUES (decode(@guid, 'hex'), @name, @truthy, @string, @number);`,
-            {
-              etypes: [etype],
-              params: {
-                guid,
-                name,
-                truthy: !!value,
                 string:
                   storageValue === 'J'
                     ? null
                     : PostgreSQLDriver.escapeNulls(`${value}`),
                 number: isNaN(Number(value)) ? null : Number(value),
+                truthy: !!value,
               },
             },
           ),
@@ -2717,19 +2584,6 @@ export default class PostgreSQLDriver extends NymphDriver {
               },
             ),
           );
-          promises.push(
-            this.queryRun(
-              `SELECT 1 FROM ${PostgreSQLDriver.escape(
-                `${this.prefix}comparisons_${etype}`,
-              )} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`,
-              {
-                etypes: [etype],
-                params: {
-                  guid,
-                },
-              },
-            ),
-          );
           promises.push(
             this.queryRun(
               `SELECT 1 FROM ${PostgreSQLDriver.escape(
@@ -2787,19 +2641,6 @@ export default class PostgreSQLDriver extends NymphDriver {
                 },
               ),
             );
-            promises.push(
-              this.queryRun(
-                `DELETE FROM ${PostgreSQLDriver.escape(
-                  `${this.prefix}comparisons_${etype}`,
-                )} WHERE "guid"=decode(@guid, 'hex');`,
-                {
-                  etypes: [etype],
-                  params: {
-                    guid,
-                  },
-                },
-              ),
-            );
             promises.push(
               this.queryRun(
                 `DELETE FROM ${PostgreSQLDriver.escape(
@@ -2932,4 +2773,29 @@ export default class PostgreSQLDriver extends NymphDriver {
 
     return nymph;
   }
+
+  public async needsMigration(): Promise<boolean> {
+    const table = await this.queryGet(
+      'SELECT "table_name" AS "table_name" FROM "information_schema"."tables" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name" LIKE @prefix LIMIT 1;',
+      {
+        params: {
+          db: this.config.database,
+          prefix: this.prefix + 'data_' + '%',
+        },
+      },
+    );
+    if (table?.table_name) {
+      const result = await this.queryGet(
+        'SELECT 1 AS "exists" FROM "information_schema"."columns" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name"=@table AND "column_name"=\'json\';',
+        {
+          params: {
+            db: this.config.database,
+            table: table.table_name,
+          },
+        },
+      );
+      return !result?.exists;
+    }
+    return false;
+  }
 }