tinybase 5.2.0-beta.4 → 5.2.0

package/umd/es6/persisters/persister-postgres/index.js

@@ -101,14 +101,14 @@
   const ALTER_TABLE = 'ALTER ' + TABLE;
   const DELETE_FROM = 'DELETE FROM';
   const SELECT_STAR_FROM = SELECT + '*FROM';
-  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+  const getWrappedCommand = (executeCommand, onSqlCommand) =>
     onSqlCommand
-      ? (sql, args) =>
+      ? (sql, params) =>
           __async$6(void 0, null, function* () {
-            onSqlCommand(sql, args);
-            return yield rawCmd(sql, args);
+            onSqlCommand(sql, params);
+            return yield executeCommand(sql, params);
           })
-      : rawCmd;
+      : executeCommand;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -476,7 +476,7 @@
     });
   };
   const getCommandFunctions = (
-    cmd,
+    databaseExecuteCommand,
     managedTableNames,
     querySchema,
     onIgnoredError,
@@ -491,8 +491,9 @@
     const refreshSchema = () =>
       __async$4(void 0, null, function* () {
         collClear(schemaMap);
-        arrayMap(yield querySchema(cmd, managedTableNames), ({tn, cn}) =>
-          setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+        arrayMap(
+          yield querySchema(databaseExecuteCommand, managedTableNames),
+          ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
         );
       });
     const loadTable = (tableName, rowIdColumnName) =>
@@ -501,7 +502,9 @@
           ? objNew(
               arrayFilter(
                 arrayMap(
-                  yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                  yield databaseExecuteCommand(
+                    SELECT_STAR_FROM + escapeId(tableName),
+                  ),
                   (row) => [
                     row[rowIdColumnName],
                     decode
@@ -537,7 +540,7 @@
           arrayIsEmpty(tableColumnNames) &&
           collHas(schemaMap, tableName)
         ) {
-          yield cmd('DROP ' + TABLE + escapeId(tableName));
+          yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
           mapSet(schemaMap, tableName);
           return;
         }
@@ -545,7 +548,7 @@
         const currentColumnNames = setNew(collValues(tableSchemaColumns));
         if (!arrayIsEmpty(tableColumnNames)) {
           if (!collHas(schemaMap, tableName)) {
-            yield cmd(
+            yield databaseExecuteCommand(
               'CREATE ' +
                 TABLE +
                 escapeId(tableName) +
@@ -568,7 +571,7 @@
                 (columnName, index) =>
                   __async$4(void 0, null, function* () {
                     if (!collDel(currentColumnNames, columnName)) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         ALTER_TABLE +
                           escapeId(tableName) +
                           'ADD' +
@@ -576,7 +579,7 @@
                           columnType,
                       );
                       if (index == 0) {
-                        yield cmd(
+                        yield databaseExecuteCommand(
                           'CREATE UNIQUE INDEX pk ON ' +
                             escapeId(tableName) +
                             `(${escapeId(rowIdColumnName)})`,
@@ -594,7 +597,7 @@
             ? arrayMap(collValues(currentColumnNames), (columnName) =>
                 __async$4(void 0, null, function* () {
                   if (columnName != rowIdColumnName) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'DROP' +
@@ -608,13 +611,15 @@
         ]);
         if (partial) {
           if (isUndefined(content)) {
-            yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+            yield databaseExecuteCommand(
+              DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+            );
           } else {
             yield promiseAll(
               objToArray(content, (row, rowId) =>
                 __async$4(void 0, null, function* () {
                   if (isUndefined(row)) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       DELETE_FROM +
                         escapeId(tableName) +
                         WHERE +
@@ -624,7 +629,7 @@
                     );
                   } else if (!arrayIsEmpty(tableColumnNames)) {
                     yield upsert(
-                      cmd,
+                      databaseExecuteCommand,
                       tableName,
                       rowIdColumnName,
                       objIds(row),
@@ -647,11 +652,11 @@
               collValues(mapGet(schemaMap, tableName)),
               (columnName) => columnName != rowIdColumnName,
             );
-            const args = [];
+            const params = [];
             const deleteRowIds = [];
             objToArray(content != null ? content : {}, (row, rowId) => {
               arrayPush(
-                args,
+                params,
                 rowId,
                 ...arrayMap(changingColumnNames, (cellId) =>
                   encode
@@ -664,14 +669,14 @@
               arrayPush(deleteRowIds, rowId);
             });
             yield upsert(
-              cmd,
+              databaseExecuteCommand,
               tableName,
               rowIdColumnName,
               changingColumnNames,
-              args,
+              params,
               orReplace,
             );
-            yield cmd(
+            yield databaseExecuteCommand(
               DELETE_FROM +
                 escapeId(tableName) +
                 WHERE +
@@ -680,34 +685,36 @@
               deleteRowIds,
             );
           } else if (collHas(schemaMap, tableName)) {
-            yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+            yield databaseExecuteCommand(
+              DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+            );
           }
         }
       });
     const transaction = (actions) =>
       __async$4(void 0, null, function* () {
         let result;
-        yield cmd('BEGIN');
+        yield databaseExecuteCommand('BEGIN');
         try {
           result = yield actions();
         } catch (error) {
           onIgnoredError == null ? void 0 : onIgnoredError(error);
         }
-        yield cmd('END');
+        yield databaseExecuteCommand('END');
         return result;
       });
     return [refreshSchema, loadTable, saveTable, transaction];
   };
   const upsert = (
-    cmd,
+    executeCommand,
     tableName,
     rowIdColumnName,
     changingColumnNames,
-    args,
+    params,
     orReplace = 0,
   ) =>
     __async$4(void 0, null, function* () {
-      return yield cmd(
+      return yield executeCommand(
         'INSERT ' +
           (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
           'INTO' +
@@ -721,7 +728,7 @@
             ),
           ) +
           ')VALUES' +
-          getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+          getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
           (orReplace
             ? EMPTY_STRING
             : 'ON CONFLICT(' +
@@ -735,7 +742,7 @@
                 ),
                 COMMA,
               )),
-        arrayMap(args, (arg) => (arg != null ? arg : null)),
+        arrayMap(params, (param) => (param != null ? param : null)),
       );
     });
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -781,7 +788,7 @@
   };
   const createJsonPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -797,7 +804,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -889,7 +896,7 @@
   };
   const createTabularPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -911,7 +918,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -1182,12 +1189,12 @@
   const EVENT_REGEX = /^([cd]:)(.+)/;
   const CHANGE_DATA_TRIGGER = TINYBASE + '_data';
   const CREATE_TABLE_TRIGGER = TINYBASE + '_table';
-  const createPostgreSqlPersister = (
+  const createCustomPostgreSqlPersister = (
     store,
     configOrStoreTableName,
-    rawCmd,
-    addNotifyListener,
-    delNotifyListener,
+    rawExecuteCommand,
+    addChangeListener,
+    delChangeListener,
     onSqlCommand,
     onIgnoredError,
     destroy,
@@ -1195,36 +1202,36 @@
     thing,
     getThing = 'getDb',
   ) => {
-    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+    const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
     const [isJson, , defaultedConfig, managedTableNamesSet] =
       getConfigStructures(configOrStoreTableName);
     const addDataTrigger = (tableName) =>
       __async$1(void 0, null, function* () {
-        yield cmd(
+        yield executeCommand(
           // eslint-disable-next-line max-len
           `CREATE OR REPLACE TRIGGER ${escapeId(CHANGE_DATA_TRIGGER + '_' + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${escapeId(tableName)} EXECUTE FUNCTION ${CHANGE_DATA_TRIGGER}()`,
         );
       });
     const addPersisterListener = (listener) =>
       __async$1(void 0, null, function* () {
-        yield cmd(
+        yield executeCommand(
           // eslint-disable-next-line max-len
           `CREATE OR REPLACE FUNCTION ${CREATE_TABLE_TRIGGER}()RETURNS event_trigger AS $t2$ DECLARE row record; BEGIN FOR row IN SELECT object_identity FROM pg_event_trigger_ddl_commands()WHERE command_tag='CREATE TABLE' LOOP PERFORM pg_notify('${EVENT_CHANNEL}','c:'||SPLIT_PART(row.object_identity,'.',2));END LOOP;END;$t2$ LANGUAGE plpgsql;`,
         );
         try {
-          yield cmd(
+          yield executeCommand(
             // eslint-disable-next-line max-len
             `CREATE EVENT TRIGGER ${CREATE_TABLE_TRIGGER} ON ddl_command_end WHEN TAG IN('CREATE TABLE')EXECUTE FUNCTION ${CREATE_TABLE_TRIGGER}();`,
           );
         } catch (e) {}
-        yield cmd(
+        yield executeCommand(
           // eslint-disable-next-line max-len
           `CREATE OR REPLACE FUNCTION ${CHANGE_DATA_TRIGGER}()RETURNS trigger AS $t1$ BEGIN PERFORM pg_notify('${EVENT_CHANNEL}','d:'||TG_TABLE_NAME);RETURN NULL;END;$t1$ LANGUAGE plpgsql;`,
         );
         yield promiseAll(
           arrayMap(collValues(managedTableNamesSet), (tableName) =>
             __async$1(void 0, null, function* () {
-              yield cmd(
+              yield executeCommand(
                 // eslint-disable-next-line max-len
                 `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
               );
@@ -1232,7 +1239,7 @@
             }),
           ),
         );
-        return yield addNotifyListener(EVENT_CHANNEL, (prefixAndTableName) =>
+        return yield addChangeListener(EVENT_CHANNEL, (prefixAndTableName) =>
           __async$1(void 0, null, function* () {
             return yield ifNotUndefined(
               strMatch(prefixAndTableName, EVENT_REGEX),
@@ -1249,10 +1256,10 @@
           }),
         );
       });
-    const delPersisterListener = delNotifyListener;
+    const delPersisterListener = delChangeListener;
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      cmd,
+      executeCommand,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
@@ -1260,9 +1267,9 @@
       persist,
       defaultedConfig,
       collValues(managedTableNamesSet),
-      (cmd2, managedTableNames) =>
+      (executeCommand2, managedTableNames) =>
         __async$1(void 0, null, function* () {
-          return yield cmd2(
+          return yield executeCommand2(
             // eslint-disable-next-line max-len
             `${SELECT} table_name tn,column_name cn FROM information_schema.columns ${WHERE} table_schema='public'AND table_name IN(${getPlaceholders(managedTableNames)})`,
             managedTableNames,
@@ -1309,14 +1316,16 @@
   ) =>
     __async(void 0, null, function* () {
       var _a;
-      const cmdSql = yield (_a = sql.reserve) == null ? void 0 : _a.call(sql);
-      return createPostgreSqlPersister(
+      const commandSql = yield (_a = sql.reserve) == null
+        ? void 0
+        : _a.call(sql);
+      return createCustomPostgreSqlPersister(
         store,
         configOrStoreTableName,
-        cmdSql == null ? void 0 : cmdSql.unsafe,
-        (channel, notifyListener) =>
+        commandSql == null ? void 0 : commandSql.unsafe,
+        (channel, listener) =>
           __async(void 0, null, function* () {
-            return sql.listen(channel, notifyListener);
+            return sql.listen(channel, listener);
           }),
         (notifyListener) =>
           __async(void 0, null, function* () {
@@ -1330,9 +1339,10 @@
         onIgnoredError,
         () => {
           var _a2;
-          return (_a2 = cmdSql == null ? void 0 : cmdSql.release) == null
+          return (_a2 = commandSql == null ? void 0 : commandSql.release) ==
+            null
             ? void 0
-            : _a2.call(cmdSql);
+            : _a2.call(commandSql);
         },
         3,
         // StoreOrMergeableStore,