Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix(import): display query result formatted (#644)
Jonathan Fishnercaa81c24a653
diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsxindex 8370875b..8d1fa627 100644--- a/src/components/code-snippet/code-snippet.tsx+++ b/src/components/code-snippet/code-snippet.tsx@@ -29,6 +29,7 @@ type EditorType = typeof Editor;export interface CodeSnippetProps {className?: string;code: string;+ codeToCopy?: string;language?: 'sql' | 'shell';loading?: boolean;autoScroll?: boolean;@@ -40,6 +41,7 @@ export const CodeSnippet: React.FC<CodeSnippetProps> = React.memo(({className,code,+ codeToCopy,loading,language = 'sql',autoScroll = false,@@ -91,7 +93,7 @@ export const CodeSnippet: React.FC<CodeSnippetProps> = React.memo(}try {- await navigator.clipboard.writeText(code);+ await navigator.clipboard.writeText(codeToCopy ?? code);setIsCopied(true);} catch {setIsCopied(false);@@ -103,7 +105,7 @@ export const CodeSnippet: React.FC<CodeSnippetProps> = React.memo(),});}- }, [code, t, toast]);+ }, [code, codeToCopy, t, toast]);return (<divdiff --git a/src/dialogs/common/import-database/import-database.tsx b/src/dialogs/common/import-database/import-database.tsxindex 86bd67dd..1aed1ff3 100644--- a/src/dialogs/common/import-database/import-database.tsx+++ b/src/dialogs/common/import-database/import-database.tsx@@ -29,6 +29,7 @@ import type { OnChange } from '@monaco-editor/react';import { useDebounce } from '@/hooks/use-debounce-v2';import { InstructionsSection } from './instructions-section/instructions-section';import { parseSQLError } from '@/lib/data/sql-import';+import type { editor } from 'monaco-editor';const errorScriptOutputMessage ='Invalid JSON. Please correct it or contact us at [email protected] for help.';@@ -164,6 +165,17 @@ export const ImportDatabase: React.FC<ImportDatabaseProps> = ({setIsCheckingJson(false);}, [scriptResult, setScriptResult]);+ const handleEditorDidMount = useCallback(+ (editor: editor.IStandaloneCodeEditor) => {+ editor.onDidPaste(() => {+ setTimeout(() => {+ editor.getAction('editor.action.formatDocument')?.run();+ }, 0);+ });+ },+ []+ );+const renderHeader = useCallback(() => {return (<DialogHeader>@@ -211,12 +223,14 @@ export const ImportDatabase: React.FC<ImportDatabaseProps> = ({onChange={debouncedHandleInputChange}language={importMethod === 'query' ? 'json' : 'sql'}loading={<Spinner />}+ onMount={handleEditorDidMount}theme={effectiveTheme === 'dark'? 'dbml-dark': 'dbml-light'}options={{+ formatOnPaste: true,minimap: { enabled: false },scrollBeyondLastLine: false,automaticLayout: true,@@ -279,6 +293,7 @@ export const ImportDatabase: React.FC<ImportDatabaseProps> = ({importMethod,effectiveTheme,debouncedHandleInputChange,+ handleEditorDidMount,showCheckJsonButton,isCheckingJson,handleCheckJson,diff --git a/src/dialogs/common/import-database/instructions-section/instructions/smart-query-instructions.tsx b/src/dialogs/common/import-database/instructions-section/instructions/smart-query-instructions.tsxindex 8d55ded8..a49e7319 100644--- a/src/dialogs/common/import-database/instructions-section/instructions/smart-query-instructions.tsx+++ b/src/dialogs/common/import-database/instructions-section/instructions/smart-query-instructions.tsx@@ -6,6 +6,7 @@ import { SSMSInfo } from './ssms-info/ssms-info';import { useTranslation } from 'react-i18next';import { Tabs, TabsList, TabsTrigger } from '@/components/tabs/tabs';import type { DatabaseClient } from '@/lib/domain/database-clients';+import { minimizeQuery } from '@/lib/data/import-metadata/scripts/minimize-script';import {databaseClientToLabelMap,databaseTypeToClientsMap,@@ -42,6 +43,25 @@ export const SmartQueryInstructions: React.FC<SmartQueryInstructionsProps> = ({const [importMetadataScripts, setImportMetadataScripts] =useState<ImportMetadataScripts | null>(null);+ const code = useMemo(+ () =>+ (databaseClients.length > 0+ ? importMetadataScripts?.[databaseType]?.({+ databaseEdition,+ databaseClient,+ })+ : importMetadataScripts?.[databaseType]?.({+ databaseEdition,+ })) ?? '',+ [+ databaseType,+ databaseEdition,+ databaseClients,+ importMetadataScripts,+ databaseClient,+ ]+ );+useEffect(() => {const loadScripts = async () => {const { importMetadataScripts } = await import(@@ -101,12 +121,8 @@ export const SmartQueryInstructions: React.FC<SmartQueryInstructionsProps> = ({<CodeSnippetclassName="h-40 w-full md:h-[200px]"loading={!importMetadataScripts}- code={- importMetadataScripts?.[databaseType]?.({- databaseEdition,- databaseClient,- }) ?? ''- }+ code={minimizeQuery(code)}+ codeToCopy={code}language={databaseClient ? 'shell' : 'sql'}/></Tabs>@@ -114,11 +130,8 @@ export const SmartQueryInstructions: React.FC<SmartQueryInstructionsProps> = ({<CodeSnippetclassName="h-40 w-full flex-auto md:h-[200px]"loading={!importMetadataScripts}- code={- importMetadataScripts?.[databaseType]?.({- databaseEdition,- }) ?? ''- }+ code={minimizeQuery(code)}+ codeToCopy={code}language="sql"/>)}diff --git a/src/lib/data/import-metadata/scripts/minimize-script.ts b/src/lib/data/import-metadata/scripts/minimize-script.tsindex de5f879f..c6b62219 100644--- a/src/lib/data/import-metadata/scripts/minimize-script.ts+++ b/src/lib/data/import-metadata/scripts/minimize-script.ts@@ -1,6 +1,9 @@export const minimizeQuery = (query: string) => {+ if (!query) return '';++ // Split into lines, trim leading spaces from each line, then rejoinreturn query- .replace(/\s+/g, ' ') // Replace multiple spaces with a single space- .replace(/\s*;\s*/g, ';') // Remove spaces around semicolons- .trim(); // Remove leading and trailing spaces+ .split('\n')+ .map((line) => line.replace(/^\s+/, '')) // Remove only leading spaces+ .join('\n');};