fix(db): check tables, set default values during migration #581 (#599)

* fix(menu): update preview code shortcut to include Alt modifier

* ci: exclude .yml and .blockmap files from artifact uploads

* build: enhance electron-builder configs with schema and artifact naming

* fix(db): check tables, set default values during migration

Author: antonreshetov

.github/workflows/build-and-release.yml

@@ -68,6 +68,8 @@ jobs:
             dist/*.msi
             dist/*.AppImage
             dist/*.snap
+            !dist/*.yml
+            !dist/*.blockmap
           if-no-files-found: warn
           retention-days: 30
 
@@ -128,6 +130,8 @@ jobs:
             dist/*.msi
             dist/*.AppImage
             dist/*.snap
+            !dist/*.yml
+            !dist/*.blockmap
           if-no-files-found: warn
           retention-days: 30
 

electron-builder.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/electron-builder",
   "appId": "io.masscode.app",
   "productName": "massCode",
   "directories": {
@@ -29,7 +30,11 @@
     "oneClick": false,
     "perMachine": false,
     "allowToChangeInstallationDirectory": true,
-    "shortcutName": "massCode"
+    "shortcutName": "massCode",
+    "artifactName": "${productName}-${version}-${arch}.${ext}"
+  },
+  "portable": {
+    "artifactName": "${productName}-${version}-${arch}-portable.${ext}"
   },
   "protocols": [
     {

electron-builder.sponsored.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/electron-builder",
   "appId": "io.masscode.app",
   "productName": "massCode",
   "directories": {
@@ -30,7 +31,11 @@
     "oneClick": false,
     "perMachine": false,
     "allowToChangeInstallationDirectory": true,
-    "shortcutName": "massCode"
+    "shortcutName": "massCode",
+    "artifactName": "${productName}-${version}-${arch}-sponsored.${ext}"
+  },
+  "portable": {
+    "artifactName": "${productName}-${version}-${arch}-portable-sponsored.${ext}"
   },
   "protocols": [
     {

src/main/db/index.ts

@@ -14,6 +14,19 @@ const isDev = process.env.NODE_ENV === 'development'
 let db: Database.Database | null = null
 let backupTimer: NodeJS.Timeout | null = null
 
+function tableExists(db: Database.Database, table: string): boolean {
+  const row = db
+    .prepare(
+      `
+    SELECT name 
+    FROM sqlite_master 
+    WHERE type='table' AND name=?
+  `,
+    )
+    .get(table)
+  return !!row
+}
+
 export function useDB() {
   if (db)
     return db
@@ -144,15 +157,26 @@ export function clearDB() {
   try {
     const db = useDB()
     const stmt = db.transaction(() => {
-      // Сначала удаляем записи из таблиц со внешними ключами
-      db.prepare('DELETE FROM snippet_tags').run()
-      db.prepare('DELETE FROM snippet_contents').run()
-      db.prepare('DELETE FROM snippets').run()
-      // Затем удаляем записи из основных таблиц
-      db.prepare('DELETE FROM tags').run()
-      db.prepare('DELETE FROM folders').run()
-      // Сбрасываем автоинкрементные счетчики, чтобы id начинались с 1
-      db.prepare('DELETE FROM sqlite_sequence').run()
+      const tables = [
+        // Таблицы со внешними ключами должны быть первыми
+        'snippet_tags',
+        'snippet_contents',
+        'snippets',
+        // Остальные таблицы можно удалить в любом порядке
+        'tags',
+        'folders',
+      ]
+
+      for (const table of tables) {
+        if (tableExists(db, table)) {
+          db.prepare(`DELETE FROM ${table}`).run()
+        }
+      }
+
+      // Сброс автоинкремента — тоже только если таблица есть
+      if (tableExists(db, 'sqlite_sequence')) {
+        db.prepare('DELETE FROM sqlite_sequence').run()
+      }
     })
 
     stmt()

src/main/db/migrate.ts

@@ -48,12 +48,12 @@ export function migrateJsonToSqlite(jsonData: JSONDB) {
         // Миграция папок
         jsonData.folders.forEach((folder) => {
           const result = insertFolderStmt.run(
-            folder.name,
+            folder.name || 'Untitled Folder',
             folder.defaultLanguage || 'plain_text',
             null, // parentId обновим позже
             folder.isOpen ? 1 : 0,
-            folder.createdAt,
-            folder.updatedAt,
+            folder.createdAt || Date.now(),
+            folder.updatedAt || Date.now(),
             folder.icon || null,
             folder.index ?? 0,
           )
@@ -74,9 +74,9 @@ export function migrateJsonToSqlite(jsonData: JSONDB) {
         // Миграция тегов
         jsonData.tags.forEach((tag) => {
           const result = insertTagStmt.run(
-            tag.name,
-            tag.createdAt,
-            tag.updatedAt,
+            tag.name || 'Untitled Tag',
+            tag.createdAt || Date.now(),
+            tag.updatedAt || Date.now(),
           )
           tagIdMap[tag.id] = Number(result.lastInsertRowid)
         })
@@ -86,13 +86,13 @@ export function migrateJsonToSqlite(jsonData: JSONDB) {
           // Определяем новый id папки для сниппета
           const mappedFolderId = folderIdMap[snippet.folderId] || null
           const result = insertSnippetStmt.run(
-            snippet.name,
+            snippet.name || 'Untitled Snippet',
             snippet.description || null,
             mappedFolderId,
             snippet.isDeleted ? 1 : 0,
             snippet.isFavorites ? 1 : 0,
-            snippet.createdAt,
-            snippet.updatedAt,
+            snippet.createdAt || Date.now(),
+            snippet.updatedAt || Date.now(),
           )
           const newSnippetId = Number(result.lastInsertRowid)
           snippetIdMap[snippet.id] = newSnippetId

src/main/menu/main.ts

@@ -217,7 +217,7 @@ const editorMenuItems: MenuConfig[] = [
   {
     label: i18n.t('menu:editor.previewCode'),
     click: () => send('main-menu:preview-code'),
-    accelerator: 'CommandOrControl+Shift+P',
+    accelerator: 'Alt+CommandOrControl+P',
   },
   {
     type: 'separator',