deploy db test WIP

packages/api/src/utility/importDbModel.js

@@ -1,70 +1,30 @@
 const fs = require('fs-extra');
 const path = require('path');
 const yaml = require('js-yaml');
-const { tableInfoFromYaml, DatabaseAnalyser } = require('dbgate-tools');
+const { databaseInfoFromYamlModel, DatabaseAnalyser } = require('dbgate-tools');
 const { startsWith } = require('lodash');
 const { archivedir } = require('./directories');
 
 async function importDbModel(inputDir) {
-  const tablesYaml = [];
-
-  const model = DatabaseAnalyser.createEmptyStructure();
+  const files = [];
 
   const dir = inputDir.startsWith('archive:')
     ? path.join(archivedir(), inputDir.substring('archive:'.length))
     : inputDir;
 
-  for (const file of await fs.readdir(dir)) {
-    if (file.endsWith('.table.yaml') || file.endsWith('.sql')) {
-      const content = await fs.readFile(path.join(dir, file), { encoding: 'utf-8' });
+  for (const name of await fs.readdir(dir)) {
+    if (name.endsWith('.table.yaml') || name.endsWith('.sql')) {
+      const text = await fs.readFile(path.join(dir, name), { encoding: 'utf-8' });
 
-      if (file.endsWith('.table.yaml')) {
-        const json = yaml.load(content);
-        tablesYaml.push(json);
-      }
-
-      if (file.endsWith('.view.sql')) {
-        model.views.push({
-          pureName: file.slice(0, -'.view.sql'.length),
-          createSql: content,
-          columns: [],
-        });
-      }
-
-      if (file.endsWith('.matview.sql')) {
-        model.matviews.push({
-          pureName: file.slice(0, -'.matview.sql'.length),
-          createSql: content,
-          columns: [],
-        });
-      }
-
-      if (file.endsWith('.proc.sql')) {
-        model.procedures.push({
-          pureName: file.slice(0, -'.proc.sql'.length),
-          createSql: content,
-        });
-      }
-
-      if (file.endsWith('.func.sql')) {
-        model.functions.push({
-          pureName: file.slice(0, -'.func.sql'.length),
-          createSql: content,
-        });
-      }
-
-      if (file.endsWith('.trigger.sql')) {
-        model.triggers.push({
-          pureName: file.slice(0, -'.trigger.sql'.length),
-          createSql: content,
-        });
-      }
+      files.push({
+        name,
+        text,
+        json: name.endsWith('.yaml') ? yaml.load(text) : null,
+      });
     }
   }
 
-  model.tables = tablesYaml.map(table => tableInfoFromYaml(table, tablesYaml));
-
-  return model;
+  return databaseInfoFromYamlModel(files);
 }
 
 module.exports = importDbModel;

packages/tools/src/yamlModelConv.ts

@@ -1,6 +1,7 @@
-import { ColumnInfo, TableInfo, ForeignKeyInfo } from 'dbgate-types';
-import _ from 'lodash';
+import { ColumnInfo, TableInfo, ForeignKeyInfo, DatabaseInfo } from 'dbgate-types';
 import _cloneDeep from 'lodash/cloneDeep';
+import _compact from 'lodash/compact';
+import { DatabaseAnalyser } from './DatabaseAnalyser';
 
 export interface ColumnInfoYaml {
   name: string;
@@ -11,6 +12,11 @@ export interface ColumnInfoYaml {
   primaryKey?: boolean;
 }
 
+export interface DatabaseModelFile {
+  name: string;
+  text: string;
+  json: {};
+}
 export interface TableInfoYaml {
   name: string;
   // schema?: string;
@@ -78,7 +84,11 @@ export function tableInfoToYaml(table: TableInfo): TableInfoYaml {
   return res;
 }
 
-function convertForeignKeyFromYaml(col: ColumnInfoYaml, table: TableInfoYaml, allTables: TableInfoYaml[]): ForeignKeyInfo {
+function convertForeignKeyFromYaml(
+  col: ColumnInfoYaml,
+  table: TableInfoYaml,
+  allTables: TableInfoYaml[]
+): ForeignKeyInfo {
   const refTable = allTables.find(x => x.name == col.references);
   if (!refTable || !refTable.primaryKey) return null;
   return {
@@ -98,7 +108,7 @@ export function tableInfoFromYaml(table: TableInfoYaml, allTables: TableInfoYaml
   const res: TableInfo = {
     pureName: table.name,
     columns: table.columns.map(c => columnInfoFromYaml(c, table)),
-    foreignKeys: _.compact(
+    foreignKeys: _compact(
       table.columns.filter(x => x.references).map(col => convertForeignKeyFromYaml(col, table, allTables))
     ),
   };
@@ -111,3 +121,54 @@ export function tableInfoFromYaml(table: TableInfoYaml, allTables: TableInfoYaml
   }
   return res;
 }
+
+export function databaseInfoFromYamlModel(files: DatabaseModelFile[]): DatabaseInfo {
+  const model = DatabaseAnalyser.createEmptyStructure();
+  const tablesYaml = [];
+
+  for (const file of files) {
+    if (file.name.endsWith('.table.yaml') || file.name.endsWith('.sql')) {
+      if (file.name.endsWith('.table.yaml')) {
+        tablesYaml.push(file.json);
+      }
+
+      if (file.name.endsWith('.view.sql')) {
+        model.views.push({
+          pureName: file.name.slice(0, -'.view.sql'.length),
+          createSql: file.text,
+          columns: [],
+        });
+      }
+
+      if (file.name.endsWith('.matview.sql')) {
+        model.matviews.push({
+          pureName: file.name.slice(0, -'.matview.sql'.length),
+          createSql: file.text,
+          columns: [],
+        });
+      }
+
+      if (file.name.endsWith('.proc.sql')) {
+        model.procedures.push({
+          pureName: file.name.slice(0, -'.proc.sql'.length),
+          createSql: file.text,
+        });
+      }
+
+      if (file.name.endsWith('.func.sql')) {
+        model.functions.push({
+          pureName: file.name.slice(0, -'.func.sql'.length),
+          createSql: file.text,
+        });
+      }
+
+      if (file.name.endsWith('.trigger.sql')) {
+        model.triggers.push({
+          pureName: file.name.slice(0, -'.trigger.sql'.length),
+          createSql: file.text,
+        });
+      }
+    }
+  }
+  return model;
+}