diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue
index b654d1f4..a6d4a5da 100644
--- a/mayfly_go_web/src/views/ops/db/DbList.vue
+++ b/mayfly_go_web/src/views/ops/db/DbList.vue
@@ -97,8 +97,8 @@
-
-
+
+
diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
index 801eff15..61a53b1f 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableOp.vue
@@ -518,7 +518,7 @@ watch(
value: defaultValue,
length: a.showLength,
numScale: a.showScale,
- notNull: a.nullable !== 'YES',
+ notNull: !a.nullable,
pri: a.isPrimaryKey,
auto_increment: a.isIdentity /*a.extra?.indexOf('auto_increment') > -1*/,
remark: a.columnComment,
diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
index 0924fa41..422fdbb1 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
@@ -7,9 +7,9 @@
- 结构
- 数据
- 结构＋数据
+ 结构
+ 数据
+ 结构＋数据
@@ -82,7 +82,7 @@
-
+
@@ -98,8 +98,8 @@
-
-
+
+
import('./DbTableOp.vue'));
@@ -275,11 +278,13 @@ const dump = (db: string) => {
const showColumns = async (row: any) => {
state.chooseTableName = row.tableName;
- state.columnDialog.columns = await dbApi.columnMetadata.request({
+ const columns = await dbApi.columnMetadata.request({
id: props.dbId,
db: props.db,
tableName: row.tableName,
});
+ DbInst.initColumns(columns);
+ state.columnDialog.columns = columns;
state.columnDialog.visible = true;
};
@@ -302,7 +307,8 @@ const showCreateDdl = async (row: any) => {
db: props.db,
tableName: row.tableName,
});
- state.ddlDialog.ddl = res;
+
+ state.ddlDialog.ddl = sqlFormatter(res, { language: getDbDialect(props.dbType).getInfo().formatSqlDialect });
state.ddlDialog.visible = true;
};
diff --git a/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue b/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
index 6867fe17..a7544551 100755
--- a/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
+++ b/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
@@ -251,8 +251,8 @@
- 文件夹
- 文件
+ 文件夹
+ 文件
diff --git a/server/internal/db/dbm/dbi/metadata.go b/server/internal/db/dbm/dbi/metadata.go
index eeda61b5..d0417a0c 100644
--- a/server/internal/db/dbm/dbi/metadata.go
+++ b/server/internal/db/dbm/dbi/metadata.go
@@ -69,7 +69,7 @@ type Column struct {
IsPrimaryKey bool `json:"isPrimaryKey"` // 是否为主键
IsIdentity bool `json:"isIdentity"` // 是否自增
ColumnDefault string `json:"columnDefault"` // 默认值
- Nullable string `json:"nullable"` // 是否可为null
+ Nullable bool `json:"nullable"` // 是否可为null
CharMaxLength int `json:"charMaxLength"` // 字符最大长度
NumPrecision int `json:"numPrecision"` // 精度(总数字位数)
NumScale int `json:"numScale"` // 小数点位数
diff --git a/server/internal/db/dbm/dm/metadata.go b/server/internal/db/dbm/dm/metadata.go
index f00b6a7b..90e28e26 100644
--- a/server/internal/db/dbm/dm/metadata.go
+++ b/server/internal/db/dbm/dm/metadata.go
@@ -105,7 +105,7 @@ func (dd *DMMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error) {
DataType: dbi.ColumnDataType(anyx.ToString(re["DATA_TYPE"])),
CharMaxLength: cast.ToInt(re["CHAR_MAX_LENGTH"]),
ColumnComment: cast.ToString(re["COLUMN_COMMENT"]),
- Nullable: cast.ToString(re["NULLABLE"]),
+ Nullable: cast.ToString(re["NULLABLE"]) == "YES",
IsPrimaryKey: cast.ToInt(re["IS_PRIMARY_KEY"]) == 1,
IsIdentity: cast.ToInt(re["IS_IDENTITY"]) == 1,
ColumnDefault: cast.ToString(re["COLUMN_DEFAULT"]),
@@ -182,7 +182,7 @@ func (dd *DMMetaData) genColumnBasicSql(column dbi.Column) string {
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
}
diff --git a/server/internal/db/dbm/mssql/metadata.go b/server/internal/db/dbm/mssql/metadata.go
index 1dfd160a..8cda438a 100644
--- a/server/internal/db/dbm/mssql/metadata.go
+++ b/server/internal/db/dbm/mssql/metadata.go
@@ -111,7 +111,7 @@ func (md *MssqlMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
DataType: dbi.ColumnDataType(anyx.ToString(re["DATA_TYPE"])),
CharMaxLength: cast.ToInt(re["CHAR_MAX_LENGTH"]),
ColumnComment: anyx.ToString(re["COLUMN_COMMENT"]),
- Nullable: anyx.ToString(re["NULLABLE"]),
+ Nullable: anyx.ToString(re["NULLABLE"]) == "YES",
IsPrimaryKey: cast.ToInt(re["IS_PRIMARY_KEY"]) == 1,
IsIdentity: cast.ToInt(re["IS_IDENTITY"]) == 1,
ColumnDefault: cast.ToString(re["COLUMN_DEFAULT"]),
@@ -287,7 +287,7 @@ func (md *MssqlMetaData) genColumnBasicSql(column dbi.Column) string {
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
}
diff --git a/server/internal/db/dbm/mysql/metadata.go b/server/internal/db/dbm/mysql/metadata.go
index 3390b8f2..f315e465 100644
--- a/server/internal/db/dbm/mysql/metadata.go
+++ b/server/internal/db/dbm/mysql/metadata.go
@@ -108,7 +108,7 @@ func (md *MysqlMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
ColumnName: cast.ToString(re["columnName"]),
DataType: dbi.ColumnDataType(cast.ToString(re["dataType"])),
ColumnComment: cast.ToString(re["columnComment"]),
- Nullable: cast.ToString(re["nullable"]),
+ Nullable: cast.ToString(re["nullable"]) == "YES",
IsPrimaryKey: cast.ToInt(re["isPrimaryKey"]) == 1,
IsIdentity: cast.ToInt(re["isIdentity"]) == 1,
ColumnDefault: cast.ToString(re["columnDefault"]),
@@ -212,7 +212,7 @@ func (md *MysqlMetaData) genColumnBasicSql(column dbi.Column) string {
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
}
diff --git a/server/internal/db/dbm/oracle/metadata.go b/server/internal/db/dbm/oracle/metadata.go
index 6c48f84a..d1ad0cd1 100644
--- a/server/internal/db/dbm/oracle/metadata.go
+++ b/server/internal/db/dbm/oracle/metadata.go
@@ -130,7 +130,7 @@ func (od *OracleMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
ColumnName: cast.ToString(re["COLUMN_NAME"]),
DataType: dbi.ColumnDataType(cast.ToString(re["DATA_TYPE"])),
ColumnComment: cast.ToString(re["COLUMN_COMMENT"]),
- Nullable: cast.ToString(re["NULLABLE"]),
+ Nullable: cast.ToString(re["NULLABLE"]) == "YES",
IsPrimaryKey: cast.ToInt(re["IS_PRIMARY_KEY"]) == 1,
IsIdentity: cast.ToInt(re["IS_IDENTITY"]) == 1,
ColumnDefault: defaultVal,
@@ -245,7 +245,7 @@ func (od *OracleMetaData) genColumnBasicSql(column dbi.Column) string {
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
}
diff --git a/server/internal/db/dbm/postgres/metadata.go b/server/internal/db/dbm/postgres/metadata.go
index 37634375..7e0bc489 100644
--- a/server/internal/db/dbm/postgres/metadata.go
+++ b/server/internal/db/dbm/postgres/metadata.go
@@ -107,7 +107,7 @@ func (pd *PgsqlMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
DataType: dbi.ColumnDataType(cast.ToString(re["dataType"])),
CharMaxLength: cast.ToInt(re["charMaxLength"]),
ColumnComment: cast.ToString(re["columnComment"]),
- Nullable: cast.ToString(re["nullable"]),
+ Nullable: cast.ToString(re["nullable"]) == "YES",
IsPrimaryKey: cast.ToInt(re["isPrimaryKey"]) == 1,
IsIdentity: cast.ToInt(re["isIdentity"]) == 1,
ColumnDefault: cast.ToString(re["columnDefault"]),
@@ -238,7 +238,7 @@ func (pd *PgsqlMetaData) genColumnBasicSql(column dbi.Column) string {
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
// 如果字段不能为空，则设置默认值
if column.ColumnDefault == "" {
diff --git a/server/internal/db/dbm/sqlite/metadata.go b/server/internal/db/dbm/sqlite/metadata.go
index 1a957b56..d334b69e 100644
--- a/server/internal/db/dbm/sqlite/metadata.go
+++ b/server/internal/db/dbm/sqlite/metadata.go
@@ -109,10 +109,6 @@ func (sd *SqliteMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
continue
}
for _, re := range res {
- nullable := "YES"
- if cast.ToInt(re["notnull"]) == 1 {
- nullable = "NO"
- }
// 去掉默认值的引号
defaultValue := cast.ToString(re["dflt_value"])
if strings.Contains(defaultValue, "'") {
@@ -123,7 +119,7 @@ func (sd *SqliteMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
TableName: tableName,
ColumnName: cast.ToString(re["name"]),
ColumnComment: "",
- Nullable: nullable,
+ Nullable: cast.ToInt(re["notnull"]) != 1,
IsPrimaryKey: cast.ToInt(re["pk"]) == 1,
IsIdentity: cast.ToInt(re["pk"]) == 1,
ColumnDefault: defaultValue,
@@ -226,14 +222,13 @@ func (sd *SqliteMetaData) GenerateIndexDDL(indexs []dbi.Index, tableInfo dbi.Tab
}
func (sd *SqliteMetaData) genColumnBasicSql(column dbi.Column) string {
-
incr := ""
if column.IsIdentity {
incr = " AUTOINCREMENT"
}
nullAble := ""
- if column.Nullable == "NO" {
+ if !column.Nullable {
nullAble = " NOT NULL"
}
@@ -281,7 +276,7 @@ func (sd *SqliteMetaData) GenerateTableDDL(columns []dbi.Column, tableInfo dbi.T
fields = append(fields, sd.genColumnBasicSql(column))
}
createSql += strings.Join(fields, ",")
- createSql += fmt.Sprintf(") ")
+ createSql += ") "
sqlArr = append(sqlArr, createSql)