Add engine to save format (v4) and engine-aware import/export

Author: Edwinexd

src/App.tsx

@@ -592,11 +592,14 @@ function App() {
 
     output += "/* --- BEGIN Metadata --- */\n";
     output += "/* --- BEGIN Save Format Version --- */\n";
-    output += "-- 3\n";
+    output += "-- 4\n";
     output += "/* --- END Save Format Version --- */\n";
     output += "/* --- BEGIN Save Language --- */\n";
     output += `-- ${lang}\n`;
     output += "/* --- END Save Language --- */\n";
+    output += "/* --- BEGIN Save Engine --- */\n";
+    output += `-- ${engine}\n`;
+    output += "/* --- END Save Engine --- */\n";
     output += "/* --- END Metadata --- */\n";
 
     output += "/* --- BEGIN Validation --- */\n";
@@ -704,7 +707,7 @@ function App() {
     const a = document.createElement("a");
     const formattedTimestamp = formatFns(new Date(), "yyyyMMdd_HHmm");
     a.href = url;
-    a.download = `validator_${lang}_${formattedTimestamp}.sql`;;
+    a.download = `validator_${lang}_${engine}_${formattedTimestamp}.sql`;
     document.body.appendChild(a);
     a.click();
     document.body.removeChild(a);
@@ -768,7 +771,7 @@ function App() {
         }
         const parsed = parseImportFile(data);
         setPendingImportData(parsed);
-        const local = getLocalData(lang);
+        const local = getLocalData(lang, engine);
         const analysis = detectConflicts(local, parsed);
         importDialogRef.current?.open(analysis);
       };

src/ImportDialog.tsx

@@ -80,7 +80,7 @@ function SqlBlock({ code, changedLines, variant }: { code: string; changedLines?
 
 const ImportDialog = forwardRef<ImportDialogHandle, ImportDialogProps>(
   ({ importedData, onOverwrite, onMergeApply }, ref) => {
-    const { t, lang, questions } = useLanguage();
+    const { t, lang, engine, questions } = useLanguage();
     const [isOpen, setIsOpen] = useState(false);
     const [step, setStep] = useState<"choose" | "resolve">("choose");
     const [analysis, setAnalysis] = useState<MergeAnalysis | null>(null);
@@ -169,6 +169,11 @@ const ImportDialog = forwardRef<ImportDialogHandle, ImportDialogProps>(
                     {t("languageMismatchWarning", { fileLang: importedData.language })}
                   </p>
                 )}
+                {importedData && importedData.engine !== engine && (
+                  <p className="text-sm text-yellow-600 dark:text-yellow-400 mt-1">
+                    {t("engineMismatchWarning", { fileEngine: importedData.engine })}
+                  </p>
+                )}
                 <div className="flex gap-3 mt-2">
                   <Button onClick={handleOverwrite} variant="destructive">
                     {t("overwriteAll")}

src/i18n/ui-strings.ts

@@ -115,6 +115,7 @@ export const uiStrings: Record<string, Record<string, string>> = {
     settingLineNumbers: "Radnummer",
     settingHighlightActiveLine: "Markera aktiv rad",
     sqlReferencePostgresql: "PostgreSQL-dokumentation",
+    engineMismatchWarning: "Varning: Denna sparfil skapades med en annan databasmotor ({{fileEngine}}). Import kan orsaka problem.",
   },
 
   en: {
@@ -228,5 +229,6 @@ export const uiStrings: Record<string, Record<string, string>> = {
     settingLineNumbers: "Line Numbers",
     settingHighlightActiveLine: "Highlight Active Line",
     sqlReferencePostgresql: "PostgreSQL Documentation",
+    engineMismatchWarning: "Warning: This save file was created with a different database engine ({{fileEngine}}). Importing may cause issues.",
   },
 };

src/mergeUtils.ts

@@ -7,6 +7,7 @@ export interface ParsedSaveData {
   correctQuestionIds: number[];
   views: View[];
   language: string;
+  engine: string;
 }
 
 export interface MergeConflict {
@@ -41,6 +42,11 @@ export function parseImportFile(data: string): ParsedSaveData {
   const commentLangMatch = data.match(/^-- Language: (\w+)$/m);
   const language = structuredLangMatch ? structuredLangMatch[1] : (commentLangMatch ? commentLangMatch[1] : "sv");
 
+  const structuredEngineMatch = data.match(
+    /\/\*\s--- BEGIN Save Engine --- \*\/\n--\s(\w+)\n\/\*\s--- END Save Engine --- \*\//
+  );
+  const engine = structuredEngineMatch ? structuredEngineMatch[1] : "sqlite";
+
   const rawQueriesMatch = data.match(
     /\/\*\s--- BEGIN Raw Queries --- \*\/\n\/\*\n([\s\S]*?)\n\*\/\n\/\*\s--- END Raw Queries --- \*\//
   );
@@ -78,11 +84,11 @@ export function parseImportFile(data: string): ParsedSaveData {
     }
   }
 
-  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language };
+  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language, engine };
 }
 
-export function getLocalData(langPrefix: string = "sv"): ParsedSaveData {
-  const pfx = `${langPrefix}:`;
+export function getLocalData(lang: string = "sv", engine: string = "sqlite"): ParsedSaveData {
+  const pfx = `${lang}:${engine}:`;
   const writtenQuestionIds: number[] = JSON.parse(
     localStorage.getItem(`${pfx}writtenQuestions`) || "[]"
   );
@@ -104,7 +110,7 @@ export function getLocalData(langPrefix: string = "sv"): ParsedSaveData {
 
   const views: View[] = JSON.parse(localStorage.getItem(`${pfx}views`) || "[]");
 
-  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language: langPrefix };
+  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language: lang, engine };
 }
 
 export function detectConflicts(
@@ -281,5 +287,5 @@ export function buildMergedData(
     new Set([...local.correctQuestionIds, ...imported.correctQuestionIds])
   ).filter((id) => String(id) in correctQueries);
 
-  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language: local.language };
+  return { rawQueries, correctQueries, writtenQuestionIds, correctQuestionIds, views, language: local.language, engine: local.engine };
 }