fix: fix dev config

nest-cli.json

@@ -3,12 +3,14 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
+    "webpack": false,
     "deleteOutDir": true,
     "assets": [
       "**/*.md"
     ],
     "builder": {
-      "type": "swc"
+      "type": "swc",
+      "options": {}
     },
     "watchAssets": true
   }

src/models/Querys/index.service.ts

@@ -7,7 +7,7 @@ import { InjectModel } from '@nestjs/sequelize';
 import { DB } from './DB.model';
 import knex from 'knex';
 import { generateDbdiagramDsl } from 'src/utils/knex/DB2DBML';
-import { each, get, map, mapValues, pick } from 'lodash';
+import { get, map, mapValues, pick } from 'lodash';
 import { Knex } from 'knex';
 import { executeSQLWithDisabledForeignKeys } from 'src/utils/knex/executeSQLWithDisabledForeignKeys';
 import exportDsl from 'src/utils/knex/export-dsl';
@@ -18,7 +18,6 @@ import SequelizeAuto, { TableData } from 'sequelize-auto-model';
 import { importer } from '@dbml/core';
 import schemaInspector from 'knex-schema-inspector';
 import { dbDrivers } from './DBTypes';
-import { DataTypes } from 'sequelize';
 
 function pureCode(raw: string): string {
   const codeRegex = /```.*\n([\s\S]*?)\n```/;
@@ -82,6 +81,12 @@ export class QueriesService implements OnModuleInit {
       }) => {
         if (type === 'sql') {
           const sqlArr = content.split(/;\n/);
+          if (sqlArr.length) {
+            sqlArr[sqlArr.length - 1] = sqlArr[sqlArr.length - 1].replace(
+              /;(\n)*?$/g,
+              '',
+            );
+          }
           const params = [];
           const templateSqlArr = [];
           for (let i = 0; i < sqlArr.length; i++) {
@@ -355,9 +360,9 @@ export class QueriesService implements OnModuleInit {
     const auto = new SequelizeAuto(sequelizeInstance, null, null, options);
     let tableData = await auto.build(false);
     tableData = auto.relate(tableData);
-    // auto.generateFn(tableData)(); without relation
-    auto.getCreateModelsFn(tableData)();
-    // this.setupAssociations(sequelizeInstance.models, tableData.relations);
+    auto.generateModelsFn(tableData)(); //without relation
+    // auto.getCreateModelsFn(tableData)();
+    this.setupAssociations(sequelizeInstance.models, tableData.relations);
     return sequelizeInstance;
   }
 
@@ -402,10 +407,15 @@ export class QueriesService implements OnModuleInit {
           attributes,
           options,
         ) || '';
-      return sql;
+      switch (client) {
+        case 'oracle':
+          //TODO dbml 当前不支持 ql/sql
+          return sql.slice(25, -73) + ';';
+        default:
+          return sql;
+      }
     });
     try {
-      console.log(tableSql, 'tableSql');
       const data = importer.import(tableSql.join('\n'), client as any);
       sequelizeInstance.close();
       return {

src/utils/knex/index.ts

@@ -18,14 +18,16 @@ export class KnexContainer {
       !KnexContainer.oracledbInit
     ) {
       try {
+        //https://medium.com/oracledevs/how-to-install-node-oracledb-5-5-and-oracle-database-on-apple-m1-m2-silicon-941fccda692f
         oracledb.initOracleClient({
           libDir:
             process.env['LD_LIBRARY_PATH'] ||
             process.env.HOME + '/Downloads/instantclient_19_8',
         });
+        console.log('启用oracle厚模式');
         KnexContainer.oracledbInit = true;
       } catch (e) {
-        console.log('无法使用oracle厚模式');
+        console.log(e, '无法使用oracle厚模式');
       }
     }
   }

tsconfig.base.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "es2017",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "paths": {
+      "@dbml/core": ["../packages/dbml/packages/dbml-core"],
+      "sequelize-auto-model": ["./packages/sequelize-auto-model"]
+    }
+  },
+  "include": ["src/**/*.ts", "src/**/*.md"]
+}

tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "paths": {
       "@dbml/core": ["./node_modules/dbml-core"],

tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "target": "es2017",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "strictNullChecks": false,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "paths": {
-      "@dbml/core": ["../packages/dbml/packages/dbml-core"],
-      "sequelize-auto-model": ["./packages/sequelize-auto-model"]
-    }
-  },
-  "include": ["src/**/*.ts", "src/**/*.md"]
+  "extends": ["./tsconfig.base.json", "./tsconfig.dev.json"]
 }