Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(kingbase): degrade gracefully on unrecognized column identity metadata (#12946)

Loc Nguyen234e5c64dc36
diff --git a/agents/drivers/kingbase-go/kingbase_metadata.go b/agents/drivers/kingbase-go/kingbase_metadata.go
index c5dc3414ab..0bfa2f1e86 100644
--- a/agents/drivers/kingbase-go/kingbase_metadata.go
+++ b/agents/drivers/kingbase-go/kingbase_metadata.go
@@ -1980,10 +1980,7 @@ func (s *server) cacheMissingColumnGenerationCapability(err error) bool {
func applyColumnGenerationMetadata(column *columnInfo, identity, generated string, expression sql.NullString) error {
identity = strings.ToLower(strings.TrimSpace(identity))
generated = strings.ToLower(strings.TrimSpace(generated))
- if generated != "" {
- if generated != "s" || identity != "" {
- return fmt.Errorf("column %q has unsupported generation metadata (identity=%q, generated=%q)", column.Name, identity, generated)
- }
+ if generated == "s" {
if !expression.Valid || strings.TrimSpace(expression.String) == "" {
return fmt.Errorf("generated column %q has no generation expression", column.Name)
}
@@ -1991,11 +1988,12 @@ func applyColumnGenerationMetadata(column *columnInfo, identity, generated strin
// in the established extra clause, never in column_default.
column.Extra = stringPtr("GENERATED ALWAYS AS (" + expression.String + ") STORED")
column.ColumnDefault = nil
- } else if identity != "" {
- column.Extra = kingbaseIdentityClause(identity)
- if column.Extra == nil {
- return fmt.Errorf("column %q has unsupported identity metadata %q", column.Name, identity)
- }
+ return nil
+ }
+ // Unrecognised identity codes (KingbaseES reports e.g. "i") keep the plain
+ // column default instead of failing the whole table load.
+ if clause := kingbaseIdentityClause(identity); clause != nil {
+ column.Extra = clause
column.ColumnDefault = nil
}
return nil
diff --git a/agents/drivers/kingbase-go/main_test.go b/agents/drivers/kingbase-go/main_test.go
index caec4bfcc3..956810bf76 100644
--- a/agents/drivers/kingbase-go/main_test.go
+++ b/agents/drivers/kingbase-go/main_test.go
@@ -3977,6 +3977,9 @@ func TestColumnDDLDefinitionPreservesCompatibilityExtras(t *testing.T) {
if extra := kingbaseIdentityClause(""); extra != nil {
t.Fatalf("non-identity column must not expose an extra clause: %#v", extra)
}
+ if extra := kingbaseIdentityClause("i"); extra != nil {
+ t.Fatalf("unrecognised identity code must not expose an extra clause: %#v", extra)
+ }
}
func TestRenderTableDDLUsesBacktickIdentifiersInMySQLCompatMode(t *testing.T) {
diff --git a/agents/drivers/kingbase-go/metadata_generation_test.go b/agents/drivers/kingbase-go/metadata_generation_test.go
index 36f5729595..1096a26888 100644
--- a/agents/drivers/kingbase-go/metadata_generation_test.go
+++ b/agents/drivers/kingbase-go/metadata_generation_test.go
@@ -17,7 +17,7 @@ func generationMetadataRows(query, identity, generated string, expression driver
if strings.Contains(query, "FROM information_schema.columns c") {
columns := []string{"column_name", "data_type", "column_type", "is_nullable", "column_default", "column_comment", "numeric_precision", "numeric_scale", "character_maximum_length"}
values := []driver.Value{"value", "integer", "integer", "YES", expression, nil, int64(32), int64(0), nil}
- if generated != "" {
+ if generated == "s" {
values[4] = nil
}
if strings.Contains(query, "AS generation_expression") {
@@ -47,6 +47,7 @@ func TestGenerationMetadataPreservesColumnSemanticsAcrossQueryPaths(t *testing.T
{name: "stored generated", generated: "s", expression: `(quantity * price)`, wantExtra: `GENERATED ALWAYS AS ((quantity * price)) STORED`},
{name: "always identity", identity: "a", expression: "nextval('public.value_seq'::regclass)", wantExtra: "GENERATED ALWAYS AS IDENTITY"},
{name: "default identity", identity: "d", expression: "nextval('public.value_seq'::regclass)", wantExtra: "GENERATED BY DEFAULT AS IDENTITY"},
+ {name: "mysql-compat identity i", identity: "i", expression: "nextval('public.value_seq'::regclass)", wantDefault: true},
} {
t.Run(fmt.Sprintf("%s/pgCatalog=%v/%s", mode, pgCatalog, test.name), func(t *testing.T) {
catalog, prefix := "sys_catalog", "sys"
@@ -133,16 +134,14 @@ func TestGeneratedCatalogCapabilityFallbackIsIndependentAndCached(t *testing.T)
}
}
-func TestGenerationMetadataDoesNotSilentlyDowngradeUnknownOrIncompleteColumns(t *testing.T) {
+func TestIncompleteGenerationMetadataReportsError(t *testing.T) {
for _, mysql := range []bool{false, true} {
for _, test := range []struct {
name, identity, generated string
expression driver.Value
}{
- {name: "unknown generation", generated: "future", expression: "a * 2"},
{name: "missing expression", generated: "s"},
{name: "blank expression", generated: "s", expression: " "},
- {name: "unknown identity", identity: "future"},
} {
t.Run(fmt.Sprintf("mysql=%v/%s", mysql, test.name), func(t *testing.T) {
state := &metadataDriverState{query: func(query string) (driver.Rows, error) {
@@ -157,7 +156,48 @@ func TestGenerationMetadataDoesNotSilentlyDowngradeUnknownOrIncompleteColumns(t
_, err = srv.queryCatalogColumns("public", "orders", "sys_catalog", "sys", "sys_get_expr")
}
if err == nil || !strings.Contains(err.Error(), "value") {
- t.Fatalf("unsupported/incomplete generation must report the affected column: %v", err)
+ t.Fatalf("incomplete generation must report the affected column: %v", err)
+ }
+ })
+ }
+ }
+}
+
+func TestUnknownGenerationOrIdentityMetadataDegradesGracefully(t *testing.T) {
+ for _, mysql := range []bool{false, true} {
+ for _, test := range []struct {
+ name, identity, generated string
+ expression driver.Value
+ }{
+ {name: "unknown generation", generated: "future", expression: "a * 2"},
+ {name: "unknown identity", identity: "future", expression: "42"},
+ {name: "mysql-compat identity", identity: "i", expression: "nextval('public.orders_id_seq'::regclass)"},
+ } {
+ t.Run(fmt.Sprintf("mysql=%v/%s", mysql, test.name), func(t *testing.T) {
+ state := &metadataDriverState{query: func(query string) (driver.Rows, error) {
+ return generationMetadataRows(query, test.identity, test.generated, test.expression), nil
+ }}
+ srv := newServer()
+ srv.db = openMetadataDB(t, state)
+ var columns []columnInfo
+ var err error
+ if mysql {
+ columns, err = srv.informationSchemaColumns("public", "orders", nil)
+ } else {
+ columns, err = srv.queryCatalogColumns("public", "orders", "sys_catalog", "sys", "sys_get_expr")
+ }
+ if err != nil {
+ t.Fatalf("unknown metadata must not error: %v", err)
+ }
+ if len(columns) != 1 {
+ t.Fatalf("expected 1 column, got %d", len(columns))
+ }
+ col := columns[0]
+ if col.Extra != nil {
+ t.Fatalf("unknown metadata must leave Extra nil, got: %v", *col.Extra)
+ }
+ if col.ColumnDefault == nil || *col.ColumnDefault != test.expression {
+ t.Fatalf("default was not preserved: %#v", col.ColumnDefault)
}
})
}