tinybase 10.0.0-beta.0 → 10.0.0-beta.2

package/persisters/persister-libsql/index.js

@@ -105,50 +105,6 @@ const arrayClear = (array, to = size(array)) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const SELECT = 'SELECT';
-const WHERE = 'WHERE';
-const TABLE = 'TABLE';
-const INSERT = 'INSERT';
-const DELETE = 'DELETE';
-const UPDATE = 'UPDATE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const FROM = 'FROM';
-const DELETE_FROM = DELETE + ' ' + FROM;
-const SELECT_STAR_FROM = SELECT + '*' + FROM;
-const PRAGMA = 'pragma_';
-const DATA_VERSION = 'data_version';
-const SCHEMA_VERSION = 'schema_version';
-const PRAGMA_TABLE = 'pragma_table_';
-const CREATE = 'CREATE ';
-const CREATE_TABLE = CREATE + TABLE;
-const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) =>
-  arrayJoin(
-    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
-    DOT,
-  );
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const anonymousPlaceholder = () => '?';
-const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => getPlaceholder(offset)),
-    COMMA,
-  );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
-const replaceTableName = (condition, tableName) =>
-  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
-
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
@@ -198,6 +154,62 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const INSERT = 'INSERT';
+const DELETE = 'DELETE';
+const UPDATE = 'UPDATE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const FROM = 'FROM';
+const DELETE_FROM = DELETE + ' ' + FROM;
+const SELECT_STAR_FROM = SELECT + '*' + FROM;
+const PRAGMA = 'pragma_';
+const DATA_VERSION = 'data_version';
+const SCHEMA_VERSION = 'schema_version';
+const PRAGMA_TABLE = 'pragma_table_';
+const CREATE = 'CREATE ';
+const CREATE_TABLE = CREATE + TABLE;
+const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) =>
+  arrayJoin(
+    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
+    DOT,
+  );
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => getPlaceholder(offset)),
+    COMMA,
+  );
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
+const replaceTableName = (condition, tableName) =>
+  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+
 const map = Map;
 const mapNew = (entries) => new map(entries);
 const mapGet = (map2, key) => map2?.get(key);
@@ -1045,7 +1057,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1201,9 +1213,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1213,8 +1223,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1273,8 +1286,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1282,9 +1299,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }
@@ -1759,30 +1774,28 @@ const createLibSqlPersister = (
     client,
     'getClient',
     void 0,
-    client.protocol == 'file'
-      ? void 0
-      : async (actions) => {
-          onSqlCommand?.('BEGIN');
-          const transaction = await client.transaction('write');
-          return await tryFinallyAsync(
-            async () => {
-              try {
-                const result = await actions(async (sql, args = []) => {
-                  onSqlCommand?.(sql, args);
-                  return (await transaction.execute({sql, args})).rows;
-                });
-                await transaction.commit();
-                onSqlCommand?.('END');
-                return result;
-              } catch (error) {
-                await tryCatch(() => transaction.rollback());
-                onSqlCommand?.('ROLLBACK');
-                throw error;
-              }
-            },
-            () => transaction.close(),
-          );
+    async (actions) => {
+      onSqlCommand?.('BEGIN');
+      const transaction = await client.transaction('write');
+      return await tryFinallyAsync(
+        async () => {
+          try {
+            const result = await actions(async (sql, args) => {
+              onSqlCommand?.(sql, args);
+              return (await transaction.execute({sql, args: args ?? []})).rows;
+            });
+            await transaction.commit();
+            onSqlCommand?.('END');
+            return result;
+          } catch (error) {
+            await tryCatch(() => transaction.rollback());
+            onSqlCommand?.('ROLLBACK');
+            throw error;
+          }
         },
+        () => transaction.close(),
+      );
+    },
   );
 
 export {createLibSqlPersister};

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

@@ -105,50 +105,6 @@ const arrayClear = (array, to = size(array)) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const SELECT = 'SELECT';
-const WHERE = 'WHERE';
-const TABLE = 'TABLE';
-const INSERT = 'INSERT';
-const DELETE = 'DELETE';
-const UPDATE = 'UPDATE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const FROM = 'FROM';
-const DELETE_FROM = DELETE + ' ' + FROM;
-const SELECT_STAR_FROM = SELECT + '*' + FROM;
-const PRAGMA = 'pragma_';
-const DATA_VERSION = 'data_version';
-const SCHEMA_VERSION = 'schema_version';
-const PRAGMA_TABLE = 'pragma_table_';
-const CREATE = 'CREATE ';
-const CREATE_TABLE = CREATE + TABLE;
-const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) =>
-  arrayJoin(
-    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
-    DOT,
-  );
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const anonymousPlaceholder = () => '?';
-const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => getPlaceholder(offset)),
-    COMMA,
-  );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
-const replaceTableName = (condition, tableName) =>
-  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
-
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
@@ -198,6 +154,62 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const INSERT = 'INSERT';
+const DELETE = 'DELETE';
+const UPDATE = 'UPDATE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const FROM = 'FROM';
+const DELETE_FROM = DELETE + ' ' + FROM;
+const SELECT_STAR_FROM = SELECT + '*' + FROM;
+const PRAGMA = 'pragma_';
+const DATA_VERSION = 'data_version';
+const SCHEMA_VERSION = 'schema_version';
+const PRAGMA_TABLE = 'pragma_table_';
+const CREATE = 'CREATE ';
+const CREATE_TABLE = CREATE + TABLE;
+const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) =>
+  arrayJoin(
+    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
+    DOT,
+  );
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => getPlaceholder(offset)),
+    COMMA,
+  );
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
+const replaceTableName = (condition, tableName) =>
+  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+
 const map = Map;
 const mapNew = (entries) => new map(entries);
 const mapGet = (map2, key) => map2?.get(key);
@@ -1045,7 +1057,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1201,9 +1213,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1213,8 +1223,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1273,8 +1286,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1282,9 +1299,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }
@@ -1759,30 +1774,28 @@ const createLibSqlPersister = (
     client,
     'getClient',
     void 0,
-    client.protocol == 'file'
-      ? void 0
-      : async (actions) => {
-          onSqlCommand?.('BEGIN');
-          const transaction = await client.transaction('write');
-          return await tryFinallyAsync(
-            async () => {
-              try {
-                const result = await actions(async (sql, args = []) => {
-                  onSqlCommand?.(sql, args);
-                  return (await transaction.execute({sql, args})).rows;
-                });
-                await transaction.commit();
-                onSqlCommand?.('END');
-                return result;
-              } catch (error) {
-                await tryCatch(() => transaction.rollback());
-                onSqlCommand?.('ROLLBACK');
-                throw error;
-              }
-            },
-            () => transaction.close(),
-          );
+    async (actions) => {
+      onSqlCommand?.('BEGIN');
+      const transaction = await client.transaction('write');
+      return await tryFinallyAsync(
+        async () => {
+          try {
+            const result = await actions(async (sql, args) => {
+              onSqlCommand?.(sql, args);
+              return (await transaction.execute({sql, args: args ?? []})).rows;
+            });
+            await transaction.commit();
+            onSqlCommand?.('END');
+            return result;
+          } catch (error) {
+            await tryCatch(() => transaction.rollback());
+            onSqlCommand?.('ROLLBACK');
+            throw error;
+          }
         },
+        () => transaction.close(),
+      );
+    },
   );
 
 export {createLibSqlPersister};

package/persisters/persister-pg/index.js

@@ -92,57 +92,6 @@ const arrayClear = (array, to = size(array)) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const SELECT = 'SELECT';
-const WHERE = 'WHERE';
-const TABLE = 'TABLE';
-const INSERT = 'INSERT';
-const DELETE = 'DELETE';
-const UPDATE = 'UPDATE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const FROM = 'FROM';
-const DELETE_FROM = DELETE + ' ' + FROM;
-const SELECT_STAR_FROM = SELECT + '*' + FROM;
-const CREATE = 'CREATE ';
-const CREATE_TABLE = CREATE + TABLE;
-const OR_REPLACE = 'OR REPLACE ';
-const FUNCTION = 'FUNCTION';
-const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) =>
-  arrayJoin(
-    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
-    DOT,
-  );
-const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const numberedPlaceholder = (offset) => '$' + offset[0]++;
-const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => getPlaceholder(offset)),
-    COMMA,
-  );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
-const replaceTableName = (condition, tableName) =>
-  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
-
-const collSize = (coll) => coll?.size ?? 0;
-const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
-const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
-const collValues = (coll) => [...(coll?.values() ?? [])];
-const collClear = (coll) => coll.clear();
-const collForEach = (coll, cb) => coll?.forEach(cb);
-const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
-
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
@@ -192,6 +141,69 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const INSERT = 'INSERT';
+const DELETE = 'DELETE';
+const UPDATE = 'UPDATE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const FROM = 'FROM';
+const DELETE_FROM = DELETE + ' ' + FROM;
+const SELECT_STAR_FROM = SELECT + '*' + FROM;
+const CREATE = 'CREATE ';
+const CREATE_TABLE = CREATE + TABLE;
+const OR_REPLACE = 'OR REPLACE ';
+const FUNCTION = 'FUNCTION';
+const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) =>
+  arrayJoin(
+    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
+    DOT,
+  );
+const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => getPlaceholder(offset)),
+    COMMA,
+  );
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
+const replaceTableName = (condition, tableName) =>
+  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+
+const collSize = (coll) => coll?.size ?? 0;
+const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
+const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
+const collValues = (coll) => [...(coll?.values() ?? [])];
+const collClear = (coll) => coll.clear();
+const collForEach = (coll, cb) => coll?.forEach(cb);
+const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
+
 const jsonString = JSON.stringify;
 const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
@@ -1039,7 +1051,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1195,9 +1207,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1207,8 +1217,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1267,8 +1280,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1276,9 +1293,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }