tinybase 9.5.0 → 9.6.0-beta.1

package/persisters/persister-pglite/index.js

@@ -250,9 +250,10 @@ const escapeId = (str) =>
 const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -995,6 +996,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1205,7 +1207,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1224,6 +1226,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1257,13 +1260,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 (
@@ -1306,6 +1310,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1319,7 +1324,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1355,6 +1364,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1366,6 +1376,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1433,6 +1444,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1444,6 +1456,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1813,12 +1826,13 @@ const createCustomPostgreSqlPersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames)})`,
+          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames, numberedPlaceholder)})`,
         managedTableNames,
       ),
     thing,
     getThing,
     'text',
+    numberedPlaceholder,
     void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),

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

@@ -250,9 +250,10 @@ const escapeId = (str) =>
 const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -995,6 +996,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1205,7 +1207,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1224,6 +1226,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1257,13 +1260,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 (
@@ -1306,6 +1310,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1319,7 +1324,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1355,6 +1364,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1366,6 +1376,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1433,6 +1444,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1444,6 +1456,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1813,12 +1826,13 @@ const createCustomPostgreSqlPersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames)})`,
+          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames, numberedPlaceholder)})`,
         managedTableNames,
       ),
     thing,
     getThing,
     'text',
+    numberedPlaceholder,
     void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),

package/persisters/persister-postgres/index.js

@@ -249,9 +249,10 @@ const escapeId = (str) =>
 const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -994,6 +995,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1204,7 +1206,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1223,6 +1225,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1256,13 +1259,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 (
@@ -1305,6 +1309,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1318,7 +1323,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1354,6 +1363,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1365,6 +1375,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1432,6 +1443,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1443,6 +1455,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1812,12 +1825,13 @@ const createCustomPostgreSqlPersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames)})`,
+          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames, numberedPlaceholder)})`,
         managedTableNames,
       ),
     thing,
     getThing,
     'text',
+    numberedPlaceholder,
     void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),

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

@@ -249,9 +249,10 @@ const escapeId = (str) =>
 const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -994,6 +995,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1204,7 +1206,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1223,6 +1225,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1256,13 +1259,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 (
@@ -1305,6 +1309,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1318,7 +1323,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1354,6 +1363,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1365,6 +1375,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1432,6 +1443,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1443,6 +1455,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1812,12 +1825,13 @@ const createCustomPostgreSqlPersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames)})`,
+          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames, numberedPlaceholder)})`,
         managedTableNames,
       ),
     thing,
     getThing,
     'text',
+    numberedPlaceholder,
     void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),

package/persisters/persister-powersync/index.js

@@ -179,9 +179,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,
@@ -1774,14 +1788,17 @@ const powerSyncUpdateThenInsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
+  const updateOffset = [1];
   const assignments = arrayJoin(
     arrayMap(
       changingColumnNames,
-      (columnName, index) => escapeId(columnName) + '=$' + (index + 1),
+      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
     ),
     COMMA,
   );
+  const rowIdPlaceholder = getPlaceholder(updateOffset);
   for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
     const rowParams = arrayMap(row, (value) => value ?? null);
     if (
@@ -1794,8 +1811,8 @@ const powerSyncUpdateThenInsert = async (
             ' ' +
             WHERE +
             escapeId(rowIdColumnName) +
-            '=$' +
-            (size(row) + 1) +
+            '=' +
+            rowIdPlaceholder +
             ' RETURNING' +
             escapeId(rowIdColumnName),
           [...rowParams, id],
@@ -1810,7 +1827,7 @@ const powerSyncUpdateThenInsert = async (
           '(' +
           escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
           ')VALUES(' +
-          getPlaceholders([id, ...row], offset) +
+          getPlaceholders([id, ...row], getPlaceholder, offset) +
           ')',
         [id, ...rowParams],
       );