Merge pull request #10053 from backstage/freben/better-sqlite-step-1

Do some groundwork for supporting the better-sqlite3 driver

packages/backend-common/src/database/connection.ts

@@ -33,6 +33,7 @@ type DatabaseClient = 'pg' | 'sqlite3' | 'mysql' | 'mysql2' | string;
  */
 const ConnectorMapping: Record<DatabaseClient, DatabaseConnector> = {
   pg: pgConnector,
+  'better-sqlite3': sqlite3Connector,
   sqlite3: sqlite3Connector,
   mysql: mysqlConnector,
   mysql2: mysqlConnector,

packages/backend-common/src/database/connectors/sqlite3.ts

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import path from 'path';
-
-import { ensureDirSync } from 'fs-extra';
-import knexFactory, { Knex } from 'knex';
 
 import { Config } from '@backstage/config';
+import { ensureDirSync } from 'fs-extra';
+import knexFactory, { Knex } from 'knex';
+import path from 'path';
 import { mergeDatabaseConfig } from '../config';
 import { DatabaseConnector } from '../types';
 

packages/backend-tasks/src/tasks/TaskWorker.ts

@@ -229,10 +229,9 @@ export class TaskWorker {
     // leaning on the database as a central clock source
     const dbNull = this.knex.raw('null');
     const dt = Duration.fromISO(recurringAtMostEveryDuration).as('seconds');
-    const nextRun =
-      this.knex.client.config.client === 'sqlite3'
-        ? this.knex.raw('datetime(next_run_start_at, ?)', [`+${dt} seconds`])
-        : this.knex.raw(`next_run_start_at + interval '${dt} seconds'`);
+    const nextRun = this.knex.client.config.client.includes('sqlite3')
+      ? this.knex.raw('datetime(next_run_start_at, ?)', [`+${dt} seconds`])
+      : this.knex.raw(`next_run_start_at + interval '${dt} seconds'`);
 
     const rows = await this.knex<DbTasksRow>(DB_TASKS_TABLE)
       .where('id', '=', this.taskId)

packages/backend-tasks/src/tasks/util.ts

@@ -40,7 +40,7 @@ export function nowPlus(duration: Duration | undefined, knex: Knex) {
   if (!seconds) {
     return knex.fn.now();
   }
-  return knex.client.config.client === 'sqlite3'
+  return knex.client.config.client.includes('sqlite3')
     ? knex.raw(`datetime('now', ?)`, [`${seconds} seconds`])
     : knex.raw(`now() + interval '${seconds} seconds'`);
 }