tinybase 5.3.2 → 5.3.3

package/persisters/persister-postgres/index.js

@@ -20,8 +20,6 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
-const arrayNew = (size2, cb) =>
-  arrayMap(new Array(size2).fill(0), (_, index) => cb(index));
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
@@ -47,9 +45,11 @@ const getWrappedCommand = (executeCommand, onSqlCommand) =>
       }
     : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const getPlaceholders = (array) =>
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const getPlaceholders = (array, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, (_, index) => '$' + (index + 1)),
+    arrayMap(array, () => '$' + offset[0]++),
     COMMA,
   );
 
@@ -445,7 +445,7 @@ const getCommandFunctions = (
   querySchema,
   onIgnoredError,
   columnType,
-  orReplace,
+  upsert = defaultUpsert,
   encode,
   decode,
 ) => {
@@ -486,26 +486,26 @@ const getCommandFunctions = (
     deleteEmptyTable,
     partial = false,
   ) => {
-    const tableCellOrValueIds = setNew();
+    const settingColumnNameSet = setNew();
     objToArray(content ?? {}, (contentRow) =>
       arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
-        setAdd(tableCellOrValueIds, cellOrValueId),
+        setAdd(settingColumnNameSet, cellOrValueId),
       ),
     );
-    const tableColumnNames = collValues(tableCellOrValueIds);
+    const settingColumnNames = collValues(settingColumnNameSet);
     if (
       !partial &&
       deleteEmptyTable &&
-      arrayIsEmpty(tableColumnNames) &&
+      arrayIsEmpty(settingColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
       await databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
       mapSet(schemaMap, tableName);
       return;
     }
-    const tableSchemaColumns = mapGet(schemaMap, tableName);
-    const currentColumnNames = setNew(collValues(tableSchemaColumns));
-    if (!arrayIsEmpty(tableColumnNames)) {
+    const currentColumnNames = mapGet(schemaMap, tableName);
+    const unaccountedColumnNames = setNew(collValues(currentColumnNames));
+    if (!arrayIsEmpty(settingColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
         await databaseExecuteCommand(
           'CREATE ' +
@@ -513,27 +513,28 @@ const getCommandFunctions = (
             escapeId(tableName) +
             `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
-                tableColumnNames,
-                (columnName) => COMMA + escapeId(columnName) + columnType,
+                settingColumnNames,
+                (settingColumnName) =>
+                  COMMA + escapeId(settingColumnName) + columnType,
               ),
             )});`,
         );
         mapSet(
           schemaMap,
           tableName,
-          setNew([rowIdColumnName, ...tableColumnNames]),
+          setNew([rowIdColumnName, ...settingColumnNames]),
         );
       } else {
         await promiseAll(
           arrayMap(
-            [rowIdColumnName, ...tableColumnNames],
-            async (columnName, index) => {
-              if (!collDel(currentColumnNames, columnName)) {
+            [rowIdColumnName, ...settingColumnNames],
+            async (settingColumnName, index) => {
+              if (!collDel(unaccountedColumnNames, settingColumnName)) {
                 await databaseExecuteCommand(
                   ALTER_TABLE +
                     escapeId(tableName) +
                     'ADD' +
-                    escapeId(columnName) +
+                    escapeId(settingColumnName) +
                     columnType,
                 );
                 if (index == 0) {
@@ -543,7 +544,7 @@ const getCommandFunctions = (
                       `(${escapeId(rowIdColumnName)})`,
                   );
                 }
-                setAdd(tableSchemaColumns, columnName);
+                setAdd(currentColumnNames, settingColumnName);
               }
             },
           ),
@@ -552,17 +553,20 @@ const getCommandFunctions = (
     }
     await promiseAll([
       ...(!partial && deleteEmptyColumns
-        ? arrayMap(collValues(currentColumnNames), async (columnName) => {
-            if (columnName != rowIdColumnName) {
-              await databaseExecuteCommand(
-                ALTER_TABLE +
-                  escapeId(tableName) +
-                  'DROP' +
-                  escapeId(columnName),
-              );
-              collDel(tableSchemaColumns, columnName);
-            }
-          })
+        ? arrayMap(
+            collValues(unaccountedColumnNames),
+            async (unaccountedColumnName) => {
+              if (unaccountedColumnName != rowIdColumnName) {
+                await databaseExecuteCommand(
+                  ALTER_TABLE +
+                    escapeId(tableName) +
+                    'DROP' +
+                    escapeId(unaccountedColumnName),
+                );
+                collDel(currentColumnNames, unaccountedColumnName);
+              }
+            },
+          )
         : []),
     ]);
     if (partial) {
@@ -582,39 +586,34 @@ const getCommandFunctions = (
                   '=$1',
                 [rowId],
               );
-            } else if (!arrayIsEmpty(tableColumnNames)) {
+            } else if (!arrayIsEmpty(settingColumnNames)) {
               await upsert(
                 databaseExecuteCommand,
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [
-                  rowId,
-                  ...(encode
+                {
+                  [rowId]: encode
                     ? arrayMap(objValues(row), encode)
-                    : objValues(row)),
-                ],
-                orReplace,
+                    : objValues(row),
+                },
+                currentColumnNames,
               );
             }
           }),
         );
       }
     } else {
-      if (!arrayIsEmpty(tableColumnNames)) {
+      if (!arrayIsEmpty(settingColumnNames)) {
         const changingColumnNames = arrayFilter(
           collValues(mapGet(schemaMap, tableName)),
-          (columnName) => columnName != rowIdColumnName,
+          (changingColumnName) => changingColumnName != rowIdColumnName,
         );
-        const params = [];
+        const rows = {};
         const deleteRowIds = [];
         objToArray(content ?? {}, (row, rowId) => {
-          arrayPush(
-            params,
-            rowId,
-            ...arrayMap(changingColumnNames, (cellId) =>
-              encode ? encode(row?.[cellId]) : row?.[cellId],
-            ),
+          rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+            encode ? encode(row?.[cellId]) : row?.[cellId],
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -623,8 +622,7 @@ const getCommandFunctions = (
           tableName,
           rowIdColumnName,
           changingColumnNames,
-          params,
-          orReplace,
+          rows,
         );
         await databaseExecuteCommand(
           DELETE_FROM +
@@ -654,61 +652,45 @@ const getCommandFunctions = (
   };
   return [refreshSchema, loadTable, saveTable, transaction];
 };
-const upsert = async (
+const defaultUpsert = async (
   executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  params,
-  orReplace = 0,
-) =>
+  rows,
+) => {
+  const offset = [1];
   await executeCommand(
-    'INSERT ' +
-      (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-      'INTO' +
+    'INSERT INTO' +
       escapeId(tableName) +
       '(' +
+      escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+      ')VALUES' +
+      arrayJoin(
+        objToArray(
+          rows,
+          (row) =>
+            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+        ),
+        COMMA,
+      ) +
+      'ON CONFLICT(' +
       escapeId(rowIdColumnName) +
+      ')DO UPDATE SET' +
       arrayJoin(
         arrayMap(
           changingColumnNames,
-          (columnName) => COMMA + escapeId(columnName),
+          (columnName) =>
+            escapeId(columnName) + '=excluded.' + escapeId(columnName),
         ),
-      ) +
-      ')VALUES' +
-      getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
-      (orReplace
-        ? EMPTY_STRING
-        : 'ON CONFLICT(' +
-          escapeId(rowIdColumnName) +
-          ')DO UPDATE SET' +
-          arrayJoin(
-            arrayMap(
-              changingColumnNames,
-              (columnName) =>
-                escapeId(columnName) + '=excluded.' + escapeId(columnName),
-            ),
-            COMMA,
-          )),
-    arrayMap(params, (param) => param ?? null),
-  );
-const getUpsertPlaceholders = (array, columnCount) =>
-  arrayJoin(
-    arrayNew(
-      size(array) / columnCount,
-      (row) =>
-        '(' +
-        arrayJoin(
-          arrayNew(
-            columnCount,
-            (column) => '$' + (row * columnCount + column + 1),
-          ),
-          COMMA,
-        ) +
-        ')',
-    ),
-    COMMA,
+        COMMA,
+      ),
+    objToArray(rows, (row, id) => [
+      id,
+      ...arrayMap(row, (value) => value ?? null),
+    ]).flat(),
   );
+};
 
 const createJsonPersister = (
   store,
@@ -724,7 +706,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -733,7 +715,7 @@ const createJsonPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -796,7 +778,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
   encode,
   decode,
 ) => {
@@ -807,7 +789,7 @@ const createTabularPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
       encode,
       decode,
     );
@@ -1095,7 +1077,7 @@ const createCustomPostgreSqlPersister = (
     thing,
     getThing,
     'text',
-    0,
+    void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),
   );

package/persisters/persister-postgres/with-schemas/index.js

@@ -20,8 +20,6 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
-const arrayNew = (size2, cb) =>
-  arrayMap(new Array(size2).fill(0), (_, index) => cb(index));
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
@@ -47,9 +45,11 @@ const getWrappedCommand = (executeCommand, onSqlCommand) =>
       }
     : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const getPlaceholders = (array) =>
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const getPlaceholders = (array, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, (_, index) => '$' + (index + 1)),
+    arrayMap(array, () => '$' + offset[0]++),
     COMMA,
   );
 
@@ -445,7 +445,7 @@ const getCommandFunctions = (
   querySchema,
   onIgnoredError,
   columnType,
-  orReplace,
+  upsert = defaultUpsert,
   encode,
   decode,
 ) => {
@@ -486,26 +486,26 @@ const getCommandFunctions = (
     deleteEmptyTable,
     partial = false,
   ) => {
-    const tableCellOrValueIds = setNew();
+    const settingColumnNameSet = setNew();
     objToArray(content ?? {}, (contentRow) =>
       arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
-        setAdd(tableCellOrValueIds, cellOrValueId),
+        setAdd(settingColumnNameSet, cellOrValueId),
       ),
     );
-    const tableColumnNames = collValues(tableCellOrValueIds);
+    const settingColumnNames = collValues(settingColumnNameSet);
     if (
       !partial &&
       deleteEmptyTable &&
-      arrayIsEmpty(tableColumnNames) &&
+      arrayIsEmpty(settingColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
       await databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
       mapSet(schemaMap, tableName);
       return;
     }
-    const tableSchemaColumns = mapGet(schemaMap, tableName);
-    const currentColumnNames = setNew(collValues(tableSchemaColumns));
-    if (!arrayIsEmpty(tableColumnNames)) {
+    const currentColumnNames = mapGet(schemaMap, tableName);
+    const unaccountedColumnNames = setNew(collValues(currentColumnNames));
+    if (!arrayIsEmpty(settingColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
         await databaseExecuteCommand(
           'CREATE ' +
@@ -513,27 +513,28 @@ const getCommandFunctions = (
             escapeId(tableName) +
             `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
-                tableColumnNames,
-                (columnName) => COMMA + escapeId(columnName) + columnType,
+                settingColumnNames,
+                (settingColumnName) =>
+                  COMMA + escapeId(settingColumnName) + columnType,
               ),
             )});`,
         );
         mapSet(
           schemaMap,
           tableName,
-          setNew([rowIdColumnName, ...tableColumnNames]),
+          setNew([rowIdColumnName, ...settingColumnNames]),
         );
       } else {
         await promiseAll(
           arrayMap(
-            [rowIdColumnName, ...tableColumnNames],
-            async (columnName, index) => {
-              if (!collDel(currentColumnNames, columnName)) {
+            [rowIdColumnName, ...settingColumnNames],
+            async (settingColumnName, index) => {
+              if (!collDel(unaccountedColumnNames, settingColumnName)) {
                 await databaseExecuteCommand(
                   ALTER_TABLE +
                     escapeId(tableName) +
                     'ADD' +
-                    escapeId(columnName) +
+                    escapeId(settingColumnName) +
                     columnType,
                 );
                 if (index == 0) {
@@ -543,7 +544,7 @@ const getCommandFunctions = (
                       `(${escapeId(rowIdColumnName)})`,
                   );
                 }
-                setAdd(tableSchemaColumns, columnName);
+                setAdd(currentColumnNames, settingColumnName);
               }
             },
           ),
@@ -552,17 +553,20 @@ const getCommandFunctions = (
     }
     await promiseAll([
       ...(!partial && deleteEmptyColumns
-        ? arrayMap(collValues(currentColumnNames), async (columnName) => {
-            if (columnName != rowIdColumnName) {
-              await databaseExecuteCommand(
-                ALTER_TABLE +
-                  escapeId(tableName) +
-                  'DROP' +
-                  escapeId(columnName),
-              );
-              collDel(tableSchemaColumns, columnName);
-            }
-          })
+        ? arrayMap(
+            collValues(unaccountedColumnNames),
+            async (unaccountedColumnName) => {
+              if (unaccountedColumnName != rowIdColumnName) {
+                await databaseExecuteCommand(
+                  ALTER_TABLE +
+                    escapeId(tableName) +
+                    'DROP' +
+                    escapeId(unaccountedColumnName),
+                );
+                collDel(currentColumnNames, unaccountedColumnName);
+              }
+            },
+          )
         : []),
     ]);
     if (partial) {
@@ -582,39 +586,34 @@ const getCommandFunctions = (
                   '=$1',
                 [rowId],
               );
-            } else if (!arrayIsEmpty(tableColumnNames)) {
+            } else if (!arrayIsEmpty(settingColumnNames)) {
               await upsert(
                 databaseExecuteCommand,
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [
-                  rowId,
-                  ...(encode
+                {
+                  [rowId]: encode
                     ? arrayMap(objValues(row), encode)
-                    : objValues(row)),
-                ],
-                orReplace,
+                    : objValues(row),
+                },
+                currentColumnNames,
               );
             }
           }),
         );
       }
     } else {
-      if (!arrayIsEmpty(tableColumnNames)) {
+      if (!arrayIsEmpty(settingColumnNames)) {
         const changingColumnNames = arrayFilter(
           collValues(mapGet(schemaMap, tableName)),
-          (columnName) => columnName != rowIdColumnName,
+          (changingColumnName) => changingColumnName != rowIdColumnName,
         );
-        const params = [];
+        const rows = {};
         const deleteRowIds = [];
         objToArray(content ?? {}, (row, rowId) => {
-          arrayPush(
-            params,
-            rowId,
-            ...arrayMap(changingColumnNames, (cellId) =>
-              encode ? encode(row?.[cellId]) : row?.[cellId],
-            ),
+          rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+            encode ? encode(row?.[cellId]) : row?.[cellId],
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -623,8 +622,7 @@ const getCommandFunctions = (
           tableName,
           rowIdColumnName,
           changingColumnNames,
-          params,
-          orReplace,
+          rows,
         );
         await databaseExecuteCommand(
           DELETE_FROM +
@@ -654,61 +652,45 @@ const getCommandFunctions = (
   };
   return [refreshSchema, loadTable, saveTable, transaction];
 };
-const upsert = async (
+const defaultUpsert = async (
   executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  params,
-  orReplace = 0,
-) =>
+  rows,
+) => {
+  const offset = [1];
   await executeCommand(
-    'INSERT ' +
-      (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-      'INTO' +
+    'INSERT INTO' +
       escapeId(tableName) +
       '(' +
+      escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+      ')VALUES' +
+      arrayJoin(
+        objToArray(
+          rows,
+          (row) =>
+            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+        ),
+        COMMA,
+      ) +
+      'ON CONFLICT(' +
       escapeId(rowIdColumnName) +
+      ')DO UPDATE SET' +
       arrayJoin(
         arrayMap(
           changingColumnNames,
-          (columnName) => COMMA + escapeId(columnName),
+          (columnName) =>
+            escapeId(columnName) + '=excluded.' + escapeId(columnName),
         ),
-      ) +
-      ')VALUES' +
-      getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
-      (orReplace
-        ? EMPTY_STRING
-        : 'ON CONFLICT(' +
-          escapeId(rowIdColumnName) +
-          ')DO UPDATE SET' +
-          arrayJoin(
-            arrayMap(
-              changingColumnNames,
-              (columnName) =>
-                escapeId(columnName) + '=excluded.' + escapeId(columnName),
-            ),
-            COMMA,
-          )),
-    arrayMap(params, (param) => param ?? null),
-  );
-const getUpsertPlaceholders = (array, columnCount) =>
-  arrayJoin(
-    arrayNew(
-      size(array) / columnCount,
-      (row) =>
-        '(' +
-        arrayJoin(
-          arrayNew(
-            columnCount,
-            (column) => '$' + (row * columnCount + column + 1),
-          ),
-          COMMA,
-        ) +
-        ')',
-    ),
-    COMMA,
+        COMMA,
+      ),
+    objToArray(rows, (row, id) => [
+      id,
+      ...arrayMap(row, (value) => value ?? null),
+    ]).flat(),
   );
+};
 
 const createJsonPersister = (
   store,
@@ -724,7 +706,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -733,7 +715,7 @@ const createJsonPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -796,7 +778,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
   encode,
   decode,
 ) => {
@@ -807,7 +789,7 @@ const createTabularPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
       encode,
       decode,
     );
@@ -1095,7 +1077,7 @@ const createCustomPostgreSqlPersister = (
     thing,
     getThing,
     'text',
-    0,
+    void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),
   );