tinybase 9.5.0 → 9.6.0-beta.1

package/persisters/persister-sqlite-wasm/index.js

@@ -138,9 +138,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1002,6 +1003,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1212,7 +1214,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1231,6 +1233,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1264,13 +1267,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1313,6 +1317,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1326,7 +1331,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1362,6 +1371,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1373,6 +1383,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1440,6 +1451,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1451,6 +1463,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1710,12 +1723,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

package/persisters/persister-sqlite-wasm/with-schemas/index.js

@@ -138,9 +138,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1002,6 +1003,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1212,7 +1214,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1231,6 +1233,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1264,13 +1267,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1313,6 +1317,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1326,7 +1331,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1362,6 +1371,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1373,6 +1383,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1440,6 +1451,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1451,6 +1463,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1710,12 +1723,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

package/persisters/persister-sqlite3/index.js

@@ -143,9 +143,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1007,6 +1008,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1217,7 +1219,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1236,6 +1238,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1269,13 +1272,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1318,6 +1322,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1331,7 +1336,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1367,6 +1376,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1378,6 +1388,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1445,6 +1456,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1456,6 +1468,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1715,12 +1728,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

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

@@ -143,9 +143,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1007,6 +1008,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1217,7 +1219,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1236,6 +1238,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1269,13 +1272,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1318,6 +1322,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1331,7 +1336,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1367,6 +1376,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1378,6 +1388,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1445,6 +1456,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1456,6 +1468,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1715,12 +1728,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,