From 279c17b56a1bb32dd2db7197663ee044d36c10c6 Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Thu, 28 Aug 2025 19:31:18 -0700 Subject: [PATCH] Correctly dump vector type. --- go/libraries/doltcore/sqle/sqlfmt/row_fmt.go | 2 +- integration-tests/bats/dump.bats | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go b/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go index 35bdafa7ea..63190ae35a 100644 --- a/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go +++ b/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go @@ -541,7 +541,7 @@ func interfaceValueAsSqlString(ctx *sql.Context, ti typeinfo.TypeInfo, value int return singleQuote + str + singleQuote, nil case typeinfo.DatetimeTypeIdentifier: return singleQuote + str + singleQuote, nil - case typeinfo.InlineBlobTypeIdentifier, typeinfo.VarBinaryTypeIdentifier: + case typeinfo.InlineBlobTypeIdentifier, typeinfo.VarBinaryTypeIdentifier, typeinfo.VectorTypeIdentifier: value, err := sql.UnwrapAny(ctx, value) if err != nil { return "", err diff --git a/integration-tests/bats/dump.bats b/integration-tests/bats/dump.bats index 58058ad8b7..f9ce430fcb 100644 --- a/integration-tests/bats/dump.bats +++ b/integration-tests/bats/dump.bats @@ -960,11 +960,12 @@ CREATE TABLE \`all_types\` ( \`v31\` varchar(255) DEFAULT NULL, \`v32\` varbinary(255) DEFAULT NULL, \`v33\` year DEFAULT NULL, + \`v34\` vector(1) DEFAULT NULL, PRIMARY KEY (\`pk\`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin; INSERT INTO \`all_types\` (\`pk\`,\`v1\`,\`v2\`,\`v3\`,\`v4\`,\`v5\`,\`v6\`,\`v7\`,\`v8\`,\`v9\`,\`v10\`,\`v11\`,\`v12\`,\`v13\`,\`v14\`,\`v15\`,\`v16\`,\`v17\`,\`v18\`,\`v19\`,\`v20\`,\`v21\`,\`v22\`,\`v23\`,\`v24\`,\`v25\`,\`v26\`,\`v27\`,\`v28\`,\`v29\`,\`v30\`,\`v31\`,\`v32\`,\`v33\`) VALUES -(1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(2, 1, 1, 1 ,('abc'),'a','2022-04-05','2022-10-05 10:14:41',2.34,2.34,'s',2.34,POINT(1,2),1,'{"a":1}',LINESTRING(POINT(0,0),POINT(1,2)),('abcd'),'abcd',('ab'),1,'abc',POINT(2,1),polygon(linestring(point(1,2),point(3,4),point(5,6),point(1,2))),'one',1,'abc','10:14:41','2022-10-05 10:14:41',('a'),1,'a','abcde',1,2022); +(1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(2, 1, 1, 1 ,('abc'),'a','2022-04-05','2022-10-05 10:14:41',2.34,2.34,'s',2.34,POINT(1,2),1,'{"a":1}',LINESTRING(POINT(0,0),POINT(1,2)),('abcd'),'abcd',('ab'),1,'abc',POINT(2,1),polygon(linestring(point(1,2),point(3,4),point(5,6),point(1,2))),'one',1,'abc','10:14:41','2022-10-05 10:14:41',('a'),1,'a','abcde',1,2022,0x12345678); SQL [ "$status" -eq 0 ] @@ -978,6 +979,9 @@ SQL run dolt sql -q "SELECT ST_AsText(v12), ST_AsText(v21), ST_AsText(v15), ST_AsText(v22) from t1;" [[ "$output" =~ "POINT(1 2) | POINT(2 1) | LINESTRING(0 0,1 2) | POLYGON((1 2,3 4,5 6,1 2))" ]] || false + run dolt sql -q "SELECT v34 from t1" + [[ "$output" =~ "0x12345678" ]] || false + # need to test binary, bit and blob types }