[sqlite] Some saveTable refactoring 4

Author: jamesgpearce

src/persisters/sqlite/commands.ts

@@ -18,7 +18,6 @@ import {
   objNew,
   objValues,
 } from '../../common/obj';
-import {SINGLE_ROW_ID, escapeId} from './common';
 import {
   arrayFilter,
   arrayIsEmpty,
@@ -32,6 +31,7 @@ import {isUndefined, promiseAll} from '../../common/other';
 import {setAdd, setNew} from '../../common/set';
 import {Id} from '../../types/common';
 import {Table} from '../../types/store';
+import {escapeId} from './common';
 
 export type Cmd = (sql: string, args?: any[]) => Promise<IdObj<any>[]>;
 type Schema = IdMap2<string>;
@@ -45,10 +45,6 @@ export const getCommandFunctions = (
   managedTableNames: string[],
 ): [
   refreshSchema: () => Promise<Schema>,
-  loadSingleRowTable: (
-    tableName: string,
-    rowIdColumnName: string,
-  ) => Promise<IdObj<any> | null>,
   loadTable: (tableName: string, rowIdColumnName: string) => Promise<Table>,
   saveTable: (
     tableName: string,
@@ -112,23 +108,6 @@ export const getCommandFunctions = (
       (_, name) => mapSet(schemaMap, name),
     );
 
-  const loadSingleRowTable = async (
-    tableName: string,
-    rowIdColumnName: string,
-  ): Promise<IdObj<any> | null> => {
-    const rows = canSelect(tableName, rowIdColumnName)
-      ? await cmd(
-          SELECT_STAR_FROM +
-            escapeId(tableName) +
-            WHERE +
-            escapeId(rowIdColumnName) +
-            '=?',
-          [SINGLE_ROW_ID],
-        )
-      : [];
-    return arrayIsEmpty(rows) ? null : objDel(rows[0], rowIdColumnName);
-  };
-
   const loadTable = async (
     tableName: string,
     rowIdColumnName: string,
@@ -273,7 +252,7 @@ export const getCommandFunctions = (
     }
   };
 
-  return [refreshSchema, loadSingleRowTable, loadTable, saveTable];
+  return [refreshSchema, loadTable, saveTable];
 };
 
 const upsert = async (

src/persisters/sqlite/json.ts

@@ -16,16 +16,17 @@ export const createJsonSqlitePersister = <ListeningHandle>(
   [storeTableName]: DefaultedJsonConfig,
   managedTableNames: string[],
 ): Persister => {
-  const [refreshSchema, loadSingleRowTable, , saveTable] = getCommandFunctions(
+  const [refreshSchema, loadTable, saveTable] = getCommandFunctions(
     cmd,
     managedTableNames,
   );
 
   const getPersisted = async (): Promise<[Tables, Values]> => {
     await refreshSchema();
     return jsonParse(
-      ((await loadSingleRowTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME)) ??
-        {})[STORE_COLUMN],
+      (await loadTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
+        SINGLE_ROW_ID
+      ]?.[STORE_COLUMN] as string,
     );
   };
 

src/persisters/sqlite/tabular.ts

@@ -21,8 +21,10 @@ export const createTabularSqlitePersister = <ListeningHandle>(
   ]: DefaultedTabularConfig,
   managedTableNames: string[],
 ): Persister => {
-  const [refreshSchema, loadSingleRowTable, loadTable, saveTable] =
-    getCommandFunctions(cmd, managedTableNames);
+  const [refreshSchema, loadTable, saveTable] = getCommandFunctions(
+    cmd,
+    managedTableNames,
+  );
 
   const saveTables = async (tables: Tables) =>
     await promiseAll(
@@ -71,7 +73,9 @@ export const createTabularSqlitePersister = <ListeningHandle>(
 
   const loadValues = async (): Promise<Values | null> =>
     valuesLoad
-      ? await loadSingleRowTable(valuesTableName, DEFAULT_ROW_ID_COLUMN_NAME)
+      ? (await loadTable(valuesTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
+          SINGLE_ROW_ID
+        ]
       : {};
 
   const getPersisted = async (): Promise<[Tables, Values] | undefined> => {