Browse Source

refactor for clarity (no logic changes)

pull/137/head
Trent Larson 2 weeks ago
parent
commit
a3951c9d66
  1. 11
      src/services/AbsurdSqlDatabaseService.ts
  2. 8
      src/services/platforms/CapacitorPlatformService.ts

11
src/services/AbsurdSqlDatabaseService.ts

@ -107,16 +107,9 @@ class AbsurdSqlDatabaseService implements DatabaseService {
const extractMigrationNames: (result: QueryExecResult[]) => Set<string> = ( const extractMigrationNames: (result: QueryExecResult[]) => Set<string> = (
result, result,
) => { ) => {
const queryResult = result as QueryExecResult[];
// Even with the "select name" query, the QueryExecResult may be [] (which doesn't make sense to me). // Even with the "select name" query, the QueryExecResult may be [] (which doesn't make sense to me).
if (queryResult.length > 0) { const names = result?.[0]?.values.map((row) => row[0] as string) || [];
const singleResult = queryResult[0]; return new Set(names);
const executedMigrations: Set<string> = new Set(
singleResult.values.map((row) => row[0] as string),
);
return executedMigrations;
}
return new Set();
}; };
// Run migrations // Run migrations

8
src/services/platforms/CapacitorPlatformService.ts

@ -236,6 +236,10 @@ export class CapacitorPlatformService implements PlatformService {
throw new Error("Database not initialized"); throw new Error("Database not initialized");
} }
const sqlExec: (sql: string) => Promise<capSQLiteChanges> =
this.db.execute.bind(this.db);
const sqlQuery: (sql: string) => Promise<DBSQLiteValues> =
this.db.query.bind(this.db);
const extractMigrationNames: (result: DBSQLiteValues) => Set<string> = ( const extractMigrationNames: (result: DBSQLiteValues) => Set<string> = (
result, result,
) => { ) => {
@ -243,10 +247,6 @@ export class CapacitorPlatformService implements PlatformService {
result.values?.map((row: { name: string }) => row.name) || []; result.values?.map((row: { name: string }) => row.name) || [];
return new Set(names); return new Set(names);
}; };
const sqlExec: (sql: string) => Promise<capSQLiteChanges> =
this.db.execute.bind(this.db);
const sqlQuery: (sql: string) => Promise<DBSQLiteValues> =
this.db.query.bind(this.db);
runMigrations(sqlExec, sqlQuery, extractMigrationNames); runMigrations(sqlExec, sqlQuery, extractMigrationNames);
} }

Loading…
Cancel
Save