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(oracle): read SDO_GEOMETRY via native driver as WKT

Melody Ruch72ffe7e22413
diff --git a/agents/drivers/oracle-go/main.go b/agents/drivers/oracle-go/main.go
index 5e082fb3b6..4176f606c9 100644
--- a/agents/drivers/oracle-go/main.go
+++ b/agents/drivers/oracle-go/main.go
@@ -4522,8 +4522,8 @@ func rewriteOracleSelectItems(items []string, columns []oracleColumnMeta, tableR
for _, column := range columns {
columnRef := oracleColumnRef(tableRef.AliasText, column.Name)
outputAlias := quoteIdentifier(column.Name)
- if isOracleSTGeometry(column) && !deferLOBs {
- rewritten = append(rewritten, oracleSTGeometryExpression(columnRef, outputAlias))
+ if isOracleGeometryType(column) && !deferLOBs {
+ rewritten = append(rewritten, oracleGeometryExpression(column, columnRef, outputAlias))
} else if isOracleXMLType(column.DataType) && !deferLOBs {
rewritten = append(rewritten, oracleXMLSerializeExpression(columnRef, outputAlias))
} else if deferLOBs {
@@ -4548,8 +4548,8 @@ func rewriteOracleSelectItems(items []string, columns []oracleColumnMeta, tableR
outputAlias = quoteIdentifier(meta.Name)
}
columnRef := oracleColumnRef(qualifier, meta.Name)
- if isOracleSTGeometry(meta) && !deferLOBs {
- rewritten = append(rewritten, oracleSTGeometryExpression(columnRef, outputAlias))
+ if isOracleGeometryType(meta) && !deferLOBs {
+ rewritten = append(rewritten, oracleGeometryExpression(meta, columnRef, outputAlias))
changed = true
sourceIndex++
continue
@@ -4579,8 +4579,8 @@ func rewriteOracleSelectItems(items []string, columns []oracleColumnMeta, tableR
func oracleDeferredLOBExpressions(columnRef, outputAlias string, sourceIndex int, column oracleColumnMeta) ([]string, bool) {
kind, placeholder, ok := oracleDeferredLOBKind(column.DataType)
valueRef := columnRef
- if isOracleSTGeometry(column) {
- kind, placeholder, ok = "C", "<ST_GEOMETRY>", true
+ if isOracleGeometryType(column) {
+ kind, placeholder, ok = "C", oracleGeometryPlaceholder(column), true
}
if !ok {
return nil, false
@@ -4595,6 +4595,24 @@ func oracleSTGeometryExpression(columnRef, alias string) string {
return fmt.Sprintf("SDE.ST_AsText(%s) AS %s", columnRef, alias)
}
+func oracleSDOGeometryExpression(columnRef, alias string) string {
+ return fmt.Sprintf("SDO_UTIL.TO_WKTGEOMETRY(%s) AS %s", columnRef, alias)
+}
+
+func oracleGeometryExpression(column oracleColumnMeta, columnRef, alias string) string {
+ if isOracleSDOGeometry(column) {
+ return oracleSDOGeometryExpression(columnRef, alias)
+ }
+ return oracleSTGeometryExpression(columnRef, alias)
+}
+
+func oracleGeometryPlaceholder(column oracleColumnMeta) string {
+ if isOracleSDOGeometry(column) {
+ return "<SDO_GEOMETRY>"
+ }
+ return "<ST_GEOMETRY>"
+}
+
func oracleDeferredLOBKind(dataType string) (kind, placeholder string, ok bool) {
switch strings.ToUpper(strings.TrimSpace(dataType)) {
case "CLOB":
@@ -4692,7 +4710,7 @@ func oracleQualifierMatchesTable(qualifier string, tableRef oracleTableRef) bool
func oracleColumnsNeedValueRewrite(columns []oracleColumnMeta, deferLOBs bool) bool {
for _, column := range columns {
- if isOracleSTGeometry(column) || isOracleXMLType(column.DataType) || (deferLOBs && isOracleDeferredLOBType(column.DataType)) {
+ if isOracleGeometryType(column) || isOracleXMLType(column.DataType) || (deferLOBs && isOracleDeferredLOBType(column.DataType)) {
return true
}
}
@@ -4728,6 +4746,19 @@ func isOracleSTGeometry(column oracleColumnMeta) bool {
return dataType == "ST_GEOMETRY" && strings.EqualFold(strings.TrimSpace(column.DataTypeOwner), "SDE")
}
+func isOracleSDOGeometry(column oracleColumnMeta) bool {
+ // Oracle Spatial's MDSYS.SDO_GEOMETRY is likewise an unregistered object
+ // type for go-ora and panics on scan; SDO_UTIL.TO_WKTGEOMETRY provides
+ // the supported CLOB (WKT) representation for reads. Most schemas only
+ // see it through the PUBLIC synonym, so DATA_TYPE_OWNER is commonly
+ // "PUBLIC" rather than "MDSYS" and isn't checked here.
+ return strings.ToUpper(strings.TrimSpace(column.DataType)) == "SDO_GEOMETRY"
+}
+
+func isOracleGeometryType(column oracleColumnMeta) bool {
+ return isOracleSTGeometry(column) || isOracleSDOGeometry(column)
+}
+
func leadingSQLSelectListStart(sqlText string) int {
trimmed := trimLeadingSQLComments(sqlText)
prefixLen := len(sqlText) - len(trimmed)
diff --git a/agents/drivers/oracle-go/main_test.go b/agents/drivers/oracle-go/main_test.go
index 6711ab05d2..c3f3e1dcef 100644
--- a/agents/drivers/oracle-go/main_test.go
+++ b/agents/drivers/oracle-go/main_test.go
@@ -2362,6 +2362,76 @@ func TestRewriteOracleSTGeometrySkipsSetQueries(t *testing.T) {
}
}
+func TestRewriteOracleSDOGeometrySelectStar(t *testing.T) {
+ sqlText, err := rewriteOracleSelectSQL(
+ `SELECT * FROM TEST_GEOM`,
+ func(schema, table string) ([]oracleColumnMeta, error) {
+ return []oracleColumnMeta{
+ {Name: "ID", DataType: "NUMBER"},
+ {Name: "GEOM", DataType: "SDO_GEOMETRY", DataTypeOwner: "PUBLIC"},
+ {Name: "NOTE", DataType: "VARCHAR2"},
+ }, nil
+ },
+ false,
+ )
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := `SELECT "ID", SDO_UTIL.TO_WKTGEOMETRY("GEOM") AS "GEOM", "NOTE" FROM TEST_GEOM`
+ if sqlText != want {
+ t.Fatalf("rewriteOracleSelectSQL() = %s, want %s", sqlText, want)
+ }
+}
+
+func TestRewriteOracleSDOGeometryExplicitColumn(t *testing.T) {
+ sqlText, err := rewriteOracleSelectSQL(
+ `SELECT t.GEOM AS shape FROM TEST_GEOM t`,
+ func(schema, table string) ([]oracleColumnMeta, error) {
+ return []oracleColumnMeta{{Name: "GEOM", DataType: "SDO_GEOMETRY", DataTypeOwner: "PUBLIC"}}, nil
+ },
+ false,
+ )
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := `SELECT SDO_UTIL.TO_WKTGEOMETRY(t."GEOM") AS shape FROM TEST_GEOM t`
+ if sqlText != want {
+ t.Fatalf("rewriteOracleSelectSQL() = %s, want %s", sqlText, want)
+ }
+}
+
+func TestRewriteOracleSDOGeometryAsDeferredValue(t *testing.T) {
+ sqlText, err := rewriteOracleSelectSQL(
+ `SELECT t.ID, t.GEOM FROM TEST_GEOM t`,
+ func(schema, table string) ([]oracleColumnMeta, error) {
+ return []oracleColumnMeta{
+ {Name: "ID", DataType: "NUMBER"},
+ {Name: "GEOM", DataType: "SDO_GEOMETRY", DataTypeOwner: "PUBLIC"},
+ }, nil
+ },
+ true,
+ )
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := `SELECT t.ID, CASE WHEN t."GEOM" IS NULL THEN NULL ELSE '<SDO_GEOMETRY>' END AS "GEOM", CASE WHEN t."GEOM" IS NULL THEN NULL ELSE 'D:1' END AS "__DBX_LARGE_VALUE_BYTES_C_1" FROM TEST_GEOM t`
+ if sqlText != want {
+ t.Fatalf("rewriteOracleSelectSQL() = %s, want %s", sqlText, want)
+ }
+}
+
+func TestOracleSDOGeometryDoesNotRequireOwner(t *testing.T) {
+ if !isOracleSDOGeometry(oracleColumnMeta{DataType: "SDO_GEOMETRY", DataTypeOwner: "PUBLIC"}) {
+ t.Fatal("expected SDO_GEOMETRY via PUBLIC synonym to be recognized")
+ }
+ if !isOracleSDOGeometry(oracleColumnMeta{DataType: "sdo_geometry"}) {
+ t.Fatal("expected SDO_GEOMETRY to be recognized regardless of owner or case")
+ }
+ if isOracleSDOGeometry(oracleColumnMeta{DataType: "VARCHAR2"}) {
+ t.Fatal("unexpected rewrite for an unrelated data type")
+ }
+}
+
func TestIsOracleExtprocAgentFailure(t *testing.T) {
cases := []struct {
name string