From 0e6b9713ce4fc626b759b54b70f2a7bf3fbdd534 Mon Sep 17 00:00:00 2001 From: zongyangleo Date: Mon, 29 Jan 2024 04:20:23 +0000 Subject: [PATCH] =?UTF-8?q?!93=20feat:=20DBMS=E6=94=AF=E6=8C=81mssql?= =?UTF-8?q?=E5=92=8C=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20*=20feat:=20=E8=A1=A8=E6=A0=BC+=E8=A1=A8=E6=A0=BC=E5=85=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98=20*=20feat:=E8=B7=B3?= =?UTF-8?q?=E6=9D=BF=E6=9C=BA=E6=94=AF=E6=8C=81=E5=A4=9A=E6=AE=B5=E8=B7=B3?= =?UTF-8?q?=20*=20fix:=20=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=BB=E9=94=AE=E5=92=8C?= =?UTF-8?q?=E8=87=AA=E5=A2=9E=20*=20feat:=20DBMS=E6=94=AF=E6=8C=81mssql=20?= =?UTF-8?q?*=20refactor:=20=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84ge?= =?UTF-8?q?tter=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mayfly_go_web/src/assets/iconfont/iconfont.js | 2 +- .../src/assets/iconfont/iconfont.json | 7 + .../src/views/ops/db/DbSqlExecLog.vue | 14 +- .../src/views/ops/db/InstanceEdit.vue | 28 +- mayfly_go_web/src/views/ops/db/SqlExec.vue | 86 ++-- .../views/ops/db/component/DbSelectTree.vue | 10 +- .../db/component/sqleditor/DbSqlEditor.vue | 8 +- .../ops/db/component/table/ColumnFormItem.vue | 9 +- .../ops/db/component/table/DbTableData.vue | 8 +- .../ops/db/component/table/DbTableDataOp.vue | 17 +- .../ops/db/component/table/DbTableOp.vue | 58 ++- mayfly_go_web/src/views/ops/db/db.ts | 51 ++- .../src/views/ops/db/dialect/dm_dialect.ts | 6 +- .../src/views/ops/db/dialect/index.ts | 17 +- .../src/views/ops/db/dialect/mssql_dialect.ts | 404 +++++++++++++++++ .../src/views/ops/db/dialect/mysql_dialect.ts | 4 +- .../views/ops/db/dialect/oracle_dialect.ts | 45 +- .../views/ops/db/dialect/postgres_dialect.ts | 4 +- .../views/ops/db/dialect/sqlite_dialect.ts | 4 +- server/go.mod | 13 +- .../internal/auth/application/application.go | 4 - .../infrastructure/persistence/persistence.go | 5 - server/internal/db/api/form/db.go | 2 +- server/internal/db/application/application.go | 16 - server/internal/db/application/db.go | 2 +- .../internal/db/application/db_data_sync.go | 16 +- server/internal/db/application/db_sql_exec.go | 40 +- server/internal/db/dbm/dbi/conn.go | 9 +- server/internal/db/dbm/dbi/db_type.go | 3 + server/internal/db/dbm/dbi/dialect.go | 5 +- .../internal/db/dbm/dbi/metasql/dm_meta.sql | 32 +- .../db/dbm/dbi/metasql/mssql_meta.sql | 209 +++++++++ .../db/dbm/dbi/metasql/mysql_meta.sql | 45 +- .../db/dbm/dbi/metasql/oracle_meta.sql | 11 +- .../db/dbm/dbi/metasql/pgsql_meta.sql | 27 +- server/internal/db/dbm/dbm.go | 1 + server/internal/db/dbm/dm/dialect.go | 7 +- server/internal/db/dbm/mssql/dialect.go | 425 ++++++++++++++++++ server/internal/db/dbm/mssql/meta.go | 48 ++ server/internal/db/dbm/mysql/dialect.go | 7 +- server/internal/db/dbm/oracle/dialect.go | 7 +- server/internal/db/dbm/postgres/dialect.go | 7 +- server/internal/db/dbm/sqlite/dialect.go | 13 +- .../infrastructure/persistence/persistence.go | 33 -- .../machine/application/application.go | 4 - .../infrastructure/persistence/persistence.go | 33 -- server/internal/machine/mcm/machine.go | 40 +- server/internal/machine/mcm/sshtunnel.go | 2 +- .../internal/mongo/application/application.go | 4 - .../infrastructure/persistence/persistence.go | 5 - .../infrastructure/persistence/persistence.go | 5 - .../internal/redis/application/application.go | 4 - .../infrastructure/persistence/persistence.go | 5 - .../internal/sys/application/application.go | 8 - .../infrastructure/persistence/persistence.go | 25 -- .../internal/tag/application/application.go | 12 - .../infrastructure/persistence/persistence.go | 21 - server/pkg/ioc/ioc.go | 2 +- server/resources/data/mayfly-go.sqlite | Bin 225280 -> 233472 bytes 59 files changed, 1506 insertions(+), 433 deletions(-) create mode 100644 mayfly_go_web/src/views/ops/db/dialect/mssql_dialect.ts create mode 100644 server/internal/db/dbm/dbi/metasql/mssql_meta.sql create mode 100644 server/internal/db/dbm/mssql/dialect.go create mode 100644 server/internal/db/dbm/mssql/meta.go diff --git a/mayfly_go_web/src/assets/iconfont/iconfont.js b/mayfly_go_web/src/assets/iconfont/iconfont.js index 5310f44f..ba16f984 100644 --- a/mayfly_go_web/src/assets/iconfont/iconfont.js +++ b/mayfly_go_web/src/assets/iconfont/iconfont.js @@ -1,5 +1,5 @@ (window._iconfont_svg_string_3953964 = - ''), + ''), (function (c) { var t = (t = document.getElementsByTagName('script'))[t.length - 1], a = t.getAttribute('data-injectcss'), diff --git a/mayfly_go_web/src/assets/iconfont/iconfont.json b/mayfly_go_web/src/assets/iconfont/iconfont.json index 8aa45e48..bf0a0409 100644 --- a/mayfly_go_web/src/assets/iconfont/iconfont.json +++ b/mayfly_go_web/src/assets/iconfont/iconfont.json @@ -74,6 +74,13 @@ "font_class": "sqlite", "unicode": "e546", "unicode_decimal": 58694 + }, + { + "icon_id": "29340317", + "name": "temp-mssql", + "font_class": "MSSQLNATIVE", + "unicode": "e600", + "unicode_decimal": 58880 } ] } diff --git a/mayfly_go_web/src/views/ops/db/DbSqlExecLog.vue b/mayfly_go_web/src/views/ops/db/DbSqlExecLog.vue index 40dd5289..9eb62edd 100644 --- a/mayfly_go_web/src/views/ops/db/DbSqlExecLog.vue +++ b/mayfly_go_web/src/views/ops/db/DbSqlExecLog.vue @@ -36,7 +36,7 @@