Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

fix: update import queries and fix bug for MySQL & MariaDB

johnnyfish89e0cddd4243
diff --git a/src/lib/data/import-metadata/scripts/maria-script.ts b/src/lib/data/import-metadata/scripts/maria-script.ts
index ad6b458f..81006569 100644
--- a/src/lib/data/import-metadata/scripts/maria-script.ts
+++ b/src/lib/data/import-metadata/scripts/maria-script.ts
@@ -70,7 +70,7 @@ export const mariaDBQuery = `WITH fk_info as (
END,
',"ordinal_position":"', cols.ordinal_position,
'","nullable":', IF(cols.is_nullable = 'YES', 'true', 'false'),
- ',"default":"', IFNULL(REPLACE(cols.column_default, '"', '\\"'), ''),
+ ',"default":"', IFNULL(REPLACE(REPLACE(cols.column_default, '\\\\', ''), '"', '\\"'), ''),
'","collation":"', IFNULL(cols.collation_name, ''), '"}'
)))))
), indexes as (
@@ -125,6 +125,6 @@ export const mariaDBQuery = `WITH fk_info as (
'], "tables":[',IFNULL(@tbls,''),
'], "views":[',IFNULL(@views,''),
'], "database_name": "', DATABASE(),
- '", "version": "', VERSION(), '"}') AS CHAR) AS ''
+ '", "version": "', VERSION(), '"}') AS CHAR) AS metadata_json_to_import
FROM fk_info, pk_info, cols, indexes, tbls, views);
`;
diff --git a/src/lib/data/import-metadata/scripts/mysql-script.ts b/src/lib/data/import-metadata/scripts/mysql-script.ts
index b9135547..d785d1fd 100644
--- a/src/lib/data/import-metadata/scripts/mysql-script.ts
+++ b/src/lib/data/import-metadata/scripts/mysql-script.ts
@@ -80,7 +80,7 @@ export const getMySQLQuery = (
END,
',"ordinal_position":"', cols.ordinal_position,
'","nullable":', IF(cols.is_nullable = 'YES', 'true', 'false'),
- ',"default":"', IFNULL(REPLACE(cols.column_default, '"', '\\"'), ''),
+ ',"default":"', IFNULL(REPLACE(REPLACE(cols.column_default, '\\\\', ''), '"', 'ֿֿֿ\\"'), ''),
'","collation":"', IFNULL(cols.collation_name, ''), '"}'
)))))
), indexes as (
@@ -135,7 +135,7 @@ export const getMySQLQuery = (
'], "tables":[',IFNULL(@tbls,''),
'], "views":[',IFNULL(@views,''),
'], "database_name": "', DATABASE(),
- '", "version": "', VERSION(), '"}') AS CHAR) AS ''
+ '", "version": "', VERSION(), '"}') AS CHAR) AS metadata_json_to_import
FROM fk_info, pk_info, cols, indexes, tbls, views);
`;
@@ -196,7 +196,7 @@ export const getMySQLQuery = (
',"scale":', IFNULL(cols.numeric_scale, 'null'), '}'), 'null'),
',"ordinal_position":"', cols.ordinal_position,
'","nullable":', IF(cols.is_nullable = 'YES', 'true', 'false'),
- ',"default":"', IFNULL(REPLACE(cols.column_default, '"', '\\"'), ''),
+ ',"default":"', IFNULL(REPLACE(REPLACE(cols.column_default, '\\\\', ''), '"', '\\"'), ''),
'","collation":"', IFNULL(cols.collation_name, ''), '"}')
) FROM (
SELECT cols.table_schema,
@@ -274,7 +274,7 @@ export const getMySQLQuery = (
WHERE vws.table_schema = DATABASE()
) AS vws), ''),
'], "database_name": "', DATABASE(),
- '", "version": "', VERSION(), '"}') AS CHAR) AS ''
+ '", "version": "', VERSION(), '"}') AS CHAR) AS metadata_json_to_import
`;
// To avoid the nondeterministic truncation and ensure that your query results are consistent.
diff --git a/src/lib/data/import-metadata/scripts/postgres-script.ts b/src/lib/data/import-metadata/scripts/postgres-script.ts
index b0f09876..c9db14ce 100644
--- a/src/lib/data/import-metadata/scripts/postgres-script.ts
+++ b/src/lib/data/import-metadata/scripts/postgres-script.ts
@@ -223,7 +223,7 @@ SELECT CONCAT('{ "fk_info": [', COALESCE(fk_metadata, ''),
'], "tables":[', COALESCE(tbls_metadata, ''),
'], "views":[', COALESCE(views_metadata, ''),
'], "database_name": "', CURRENT_DATABASE(), '', '", "version": "', '',
- '"}') AS " "
+ '"}') AS metadata_json_to_import
FROM fk_info${databaseEdition ? '_' + databaseEdition : ''}, pk_info, cols, indexes_metadata, tbls, config, views;
`;
diff --git a/src/lib/data/import-metadata/scripts/sqlite-script.ts b/src/lib/data/import-metadata/scripts/sqlite-script.ts
index 667226fd..b1b8ae0f 100644
--- a/src/lib/data/import-metadata/scripts/sqlite-script.ts
+++ b/src/lib/data/import-metadata/scripts/sqlite-script.ts
@@ -159,5 +159,5 @@ replace(replace(replace(
'version', sqlite_version()
),
'\\"', '"'),'"[', '['), ']"', ']'
-)AS database_info;
+) AS metadata_json_to_import;
`;
diff --git a/src/lib/data/import-metadata/scripts/sqlserver-script.ts b/src/lib/data/import-metadata/scripts/sqlserver-script.ts
index a1ac173b..763abb93 100644
--- a/src/lib/data/import-metadata/scripts/sqlserver-script.ts
+++ b/src/lib/data/import-metadata/scripts/sqlserver-script.ts
@@ -179,5 +179,5 @@ SELECT JSON_QUERY(
', "views": ' + ISNULL((SELECT cast(all_views_json as nvarchar(max)) FROM views), N'[]') +
', "database_name": "' + DB_NAME() + '"' +
', "version": ""}'
-) AS full_json_result;
+) AS metadata_json_to_import;
`;