import models tests fixed

integration-tests/__tests__/db-import-export.spec.js

@@ -182,7 +182,7 @@ describe('DB Import/export', () => {
     })
   );
 
-  test.each(engines.map(engine => [engine.label, engine]))(
+  test.each(engines.filter(engine => !engine.skipImportModel).map(engine => [engine.label, engine]))(
     'Import guitar shop - schema + data - %s',
     testWrapper(async (conn, driver, engine) => {
       await importDbFromFolder({

integration-tests/engines.js

@@ -539,6 +539,7 @@ const clickhouseEngine = {
   alterTableAddColumnSyntax: true,
   dbSnapshotBySeconds: true,
   skipChangeColumn: true,
+  skipImportModel: true,
 };
 
 /** @type {import('dbgate-types').TestEngineInfo} */
@@ -627,6 +628,7 @@ const cassandraEngine = {
   skipDataModifications: true,
   skipDataDuplicator: true,
   skipDeploy: true,
+  skipImportModel: true,
 
   forceSortResults: true,
   forceSortStructureColumns: true,
@@ -657,8 +659,8 @@ const enginesOnLocal = [
   // sqlServerEngine,
   // sqliteEngine,
   // cockroachDbEngine,
-  // clickhouseEngine,
+  clickhouseEngine,
-  oracleEngine,
+  // oracleEngine,
 ];
 
 /** @type {import('dbgate-types').TestEngineInfo[] & Record<string, import('dbgate-types').TestEngineInfo>} */

packages/api/src/shell/importDbFromFolder.js

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const executeQuery = require('./executeQuery');
 const { connectUtility } = require('../utility/connectUtility');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const { getAlterDatabaseScript, DatabaseAnalyser } = require('dbgate-tools');
+const { getAlterDatabaseScript, DatabaseAnalyser, runCommandOnDriver } = require('dbgate-tools');
 const importDbModel = require('../utility/importDbModel');
 const jsonLinesReader = require('./jsonLinesReader');
 const tableWriter = require('./tableWriter');
@@ -41,17 +41,38 @@ async function importDbFromFolder({ connection, systemConnection, driver, folder
       })),
     };
 
+    // const plan = createAlterDatabasePlan(
+    //   DatabaseAnalyser.createEmptyStructure(),
+    //   driver.dialect.enableAllForeignKeys ? modelAdapted : modelNoFk,
+    //   {},
+    //   DatabaseAnalyser.createEmptyStructure(),
+    //   driver.dialect.enableAllForeignKeys ? modelAdapted : modelNoFk,
+    //   driver
+    // );
+    // const dmp1 = driver.createDumper({ useHardSeparator: true });
+    // if (driver.dialect.enableAllForeignKeys) {
+    //   dmp1.enableAllForeignKeys(false);
+    // }
+    // plan.run(dmp1);
+    // if (driver.dialect.enableAllForeignKeys) {
+    //   dmp1.enableAllForeignKeys(true);
+    // }
+
     const { sql } = getAlterDatabaseScript(
       DatabaseAnalyser.createEmptyStructure(),
-      modelNoFk,
+      driver.dialect.enableAllForeignKeys ? modelAdapted : modelNoFk,
       {},
       DatabaseAnalyser.createEmptyStructure(),
-      modelNoFk,
+      driver.dialect.enableAllForeignKeys ? modelAdapted : modelNoFk,
       driver
     );
     // console.log('CREATING STRUCTURE:', sql);
     await executeQuery({ connection, systemConnection: dbhan, driver, sql, logScriptItems: true });
 
+    if (driver.dialect.enableAllForeignKeys) {
+      await runCommandOnDriver(dbhan, driver, dmp => dmp.enableAllForeignKeys(false));
+    }
+
     for (const table of modelAdapted.tables) {
       const fileName = path.join(folder, `${table.pureName}.jsonl`);
       if (await fs.exists(fileName)) {
@@ -66,14 +87,19 @@ async function importDbFromFolder({ connection, systemConnection, driver, folder
       }
     }
 
-    const dmp = driver.createDumper();
+    if (driver.dialect.enableAllForeignKeys) {
-    for (const table of modelAdapted.tables) {
+      await runCommandOnDriver(dbhan, driver, dmp => dmp.enableAllForeignKeys(true));
-      for (const fk of table.foreignKeys) {
+    } else if (driver.dialect.createForeignKey) {
-        dmp.createForeignKey(fk);
+      const dmp = driver.createDumper();
+      for (const table of modelAdapted.tables) {
+        for (const fk of table.foreignKeys) {
+          dmp.createForeignKey(fk);
+        }
       }
+
+      // create foreign keys
+      await executeQuery({ connection, systemConnection: dbhan, driver, sql: dmp.s, logScriptItems: true });
     }
-    // create foreign keys
-    await executeQuery({ connection, systemConnection: dbhan, driver, sql: dmp.s, logScriptItems: true });
   } finally {
     if (!systemConnection) {
       await driver.close(dbhan);

packages/tools/src/SqlDumper.ts

@@ -350,7 +350,9 @@ export class SqlDumper implements AlterProcessor {
   }
 
   createForeignKeyFore(fk: ForeignKeyInfo) {
-    if (fk.constraintName != null) this.put('^constraint %i ', fk.constraintName);
+    if (fk.constraintName != null && !this.dialect.anonymousForeignKey) {
+      this.put('^constraint %i ', fk.constraintName);
+    }
     this.put(
       '^foreign ^key (%,i) ^references %f (%,i)',
       fk.columns.map(x => x.columnName),
@@ -367,6 +369,7 @@ export class SqlDumper implements AlterProcessor {
 
   allowIdentityInsert(table: NamedObjectInfo, allow: boolean) {}
   enableConstraints(table: NamedObjectInfo, enabled: boolean) {}
+  enableAllForeignKeys(enabled: boolean) {}
 
   comment(value: string) {
     if (!value) return;

packages/types/dialect.d.ts

@@ -13,8 +13,10 @@ export interface SqlDialect {
   fallbackDataType?: string;
   explicitDropConstraint?: boolean;
   anonymousPrimaryKey?: boolean;
+  anonymousForeignKey?: boolean;
   defaultSchemaName?: string;
   enableConstraintsPerTable?: boolean;
+  enableAllForeignKeys?: boolean;
   requireStandaloneSelectForScopeIdentity?: boolean;
   allowMultipleValuesInsert?: boolean;
 

packages/types/test-engines.d.ts

@@ -39,6 +39,7 @@ export type TestEngineInfo = {
   skipNonPkRename?: boolean;
   skipPkDrop?: boolean;
   skipOrderBy?: boolean;
+  skipImportModel?: boolean;
 
   forceSortResults?: boolean;
   forceSortStructureColumns?: boolean;

plugins/dbgate-plugin-cassandra/src/frontend/Dumper.js

@@ -4,6 +4,7 @@
 const { SqlDumper } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const numericDataTypes = ['tinyint', 'smallint', 'int', 'bigint', 'varint', 'float', 'double', 'decimal'];
+const stringDataTypes = ['text', 'varchar'];
 
 class Dumper extends SqlDumper {
   /**
@@ -64,7 +65,12 @@ class Dumper extends SqlDumper {
     }
 
     if (numericDataTypes.includes(dataType?.toLowerCase()) && !Number.isNaN(parseFloat(value))) {
-      this.putRaw(value);
+      this.putRaw(parseFloat(value));
+      return;
+    }
+
+    if (stringDataTypes.includes(dataType?.toLowerCase())) {
+      super.putValue(value?.toString());
       return;
     }
 

plugins/dbgate-plugin-sqlite/src/frontend/Dumper.js

@@ -36,6 +36,10 @@ class Dumper extends SqlDumper {
     }
     super.createTablePrimaryKeyCore(table);
   }
+
+  enableAllForeignKeys(enabled) {
+    this.putCmd('^pragma ^foreign_keys = %s', enabled ? 'on' : 'off');
+  }
 }
 
 module.exports = Dumper;

plugins/dbgate-plugin-sqlite/src/frontend/driver.js

@@ -30,11 +30,13 @@ const dialect = {
   createIndex: true,
   dropIndex: true,
   createForeignKey: false,
+  enableForeignKeyChecks: false,
   dropForeignKey: false,
   createPrimaryKey: false,
   dropPrimaryKey: false,
   dropReferencesWhenDropTable: false,
   filteredIndexes: true,
+  anonymousForeignKey: true,
 };
 
 /** @type {import('dbgate-types').EngineDriver} */