sqlite-hub 1.1.1 → 1.2.0

package/server/routes/connections.js

@@ -76,6 +76,24 @@ function createConnectionsRouter({ connectionManager, importService, backupServi
     })
   );
 
+  router.post(
+    "/import-sql/preview",
+    route((req, res) => {
+      const result = importService.inspectSqlImport({
+        sqlFilePath: req.body.sqlFilePath,
+      });
+
+      res.json(
+        successResponse({
+          message: result.requiresSafetyBackup
+            ? "Import safety backup recommended."
+            : "Import can continue without a safety backup.",
+          data: result,
+        })
+      );
+    })
+  );
+
   router.post(
     "/import-sql",
     route((req, res) => {
@@ -104,12 +122,17 @@ function createConnectionsRouter({ connectionManager, importService, backupServi
 
   router.post(
     "/backup-active",
-    route((req, res) => {
-      const backup = backupService.createActiveBackup();
+    route(async (req, res) => {
+      const backup = await backupService.createActiveBackup({
+        name: req.body?.name,
+        notes: req.body?.notes,
+        type: req.body?.type,
+        context: req.body?.context,
+      });
 
       res.json(
         successResponse({
-          message: `Backup created: ${backup.fileName}`,
+          message: "Backup created and verified.",
           data: backup,
         })
       );

package/server/routes/externalApi.js

@@ -70,7 +70,10 @@ function createExternalApiRouter({ databaseService, tokenService, appInfoService
 
       authenticateDatabaseRequest(req, tokenService, databaseId);
 
-      const { result } = databaseService.executeRawQuery(databaseId, sql, { storeName });
+      const { result } = databaseService.executeRawQuery(databaseId, sql, {
+        storeName,
+        executedBy: "api",
+      });
 
       res.json(
         successResponse({
@@ -168,7 +171,8 @@ function createExternalApiRouter({ databaseService, tokenService, appInfoService
     route((req, res) => {
       const { query, result } = databaseService.executeSavedQuery(
         req.params.databaseId,
-        req.params.queryName
+        req.params.queryName,
+        { executedBy: "api" }
       );
 
       res.json(

package/server/server.js

@@ -24,6 +24,7 @@ const { MediaTaggingService } = require("./services/sqlite/mediaTaggingService")
 const { ApiTokenService } = require("./services/apiTokenService");
 const { DatabaseCommandService } = require("./services/databaseCommandService");
 const { createConnectionsRouter } = require("./routes/connections");
+const { createBackupsRouter } = require("./routes/backups");
 const { createOverviewRouter } = require("./routes/overview");
 const { createSqlRouter } = require("./routes/sql");
 const { createChartsRouter } = require("./routes/charts");
@@ -56,7 +57,7 @@ const connectionManager = new ConnectionManager({ appStateStore });
 const overviewService = new OverviewService({ connectionManager });
 const sqlExecutor = new SqlExecutor({ connectionManager, appStateStore });
 const importService = new ImportService({ connectionManager });
-const backupService = new BackupService({ connectionManager });
+const backupService = new BackupService({ connectionManager, appStateStore });
 const nativeFileDialogService = new NativeFileDialogService();
 const exportService = new ExportService({
   appStateStore,
@@ -114,6 +115,7 @@ app.use(
     nativeFileDialogService,
   })
 );
+app.use("/api/backups", createBackupsRouter({ backupService }));
 app.use("/api/db", createOverviewRouter({ overviewService }));
 app.use("/api/sql", createSqlRouter({ appStateStore, connectionManager, sqlExecutor }));
 app.use("/api/charts", createChartsRouter({ appStateStore, connectionManager, sqlExecutor }));

package/server/services/databaseCommandService.js

@@ -283,7 +283,7 @@ class DatabaseCommandService {
     const collection = this.appStateStore.buildQueryHistoryCollection({
       databaseKey: connection.id,
       search: queryName,
-      onlySaved: false,
+      onlySaved: true,
       limit: 100,
     });
 
@@ -326,10 +326,11 @@ class DatabaseCommandService {
     return this.requireQuery(databaseReference, queryName);
   }
 
-  executeSavedQuery(databaseReference, queryName) {
+  executeSavedQuery(databaseReference, queryName, options = {}) {
     const query = this.requireQuery(databaseReference, queryName);
+    const { executedBy = "user" } = options;
     const result = this.withDatabase(databaseReference, ({ runtime }) =>
-      runtime.sqlExecutor.execute(query.rawSql, { persistHistory: false })
+      runtime.sqlExecutor.execute(query.rawSql, { executedBy })
     );
 
     return { query, result };