Fix returning a proper data type for UUIDs

BemiHQ · Feb 1, 2025 · 373538f · 373538f
1 parent caee9be
commit 373538f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/scripts/test-data-types.sql b/scripts/test-data-types.sql
@@ -112,7 +112,7 @@ INSERT INTO test_table (
   '2024-01-01 12:00:00.123',                -- timestamp_ms_column
   '2024-01-01 12:00:00.123456-05',          -- timestamptz_column
   '2024-01-01 12:00:00.123-05',             -- timestamptz_ms_column
-  gen_random_uuid(),                        -- uuid_column
+  '58a7c845-af77-44b2-8664-7ca613d92f04',   -- uuid_column
   decode('48656c6c6f', 'hex'),              -- bytea_column
   '1 mon 2 days 01:00:01.000001'::INTERVAL, -- interval_column
   '(1, 2)'::POINT,                          -- point_column

diff --git a/src/main.go b/src/main.go
@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-const VERSION = "0.30.2"
+const VERSION = "0.30.3"
 
 func main() {
 	config := LoadConfig()

diff --git a/src/query_handler.go b/src/query_handler.go
@@ -529,9 +529,9 @@ func (queryHandler *QueryHandler) columnTypeOid(col *sql.ColumnType) uint32 {
 	case "TIMESTAMP[]":
 		return pgtype.TimestampArrayOID
 	case "BLOB":
-		return pgtype.ByteaOID
+		return pgtype.UUIDOID
 	case "BLOB[]":
-		return pgtype.ByteaArrayOID
+		return pgtype.UUIDArrayOID
 	default:
 		if strings.HasPrefix(col.DatabaseTypeName(), "DECIMAL") {
 			if strings.HasSuffix(col.DatabaseTypeName(), "[]") {

diff --git a/src/query_handler_test.go b/src/query_handler_test.go
@@ -492,14 +492,14 @@ func TestHandleQuery(t *testing.T) {
 			"types":       {Uint32ToString(pgtype.TimestampOID)},
 			"values":      {"2024-01-01 07:00:00.12"},
 		},
-		"SELECT uuid_column FROM public.test_table WHERE uuid_column IS NOT NULL": {
+		"SELECT uuid_column FROM public.test_table WHERE uuid_column = '58a7c845-af77-44b2-8664-7ca613d92f04'": {
 			"description": {"uuid_column"},
-			"types":       {Uint32ToString(pgtype.ByteaOID)},
+			"types":       {Uint32ToString(pgtype.UUIDOID)},
 			"values":      {"58a7c845-af77-44b2-8664-7ca613d92f04"},
 		},
 		"SELECT uuid_column FROM public.test_table WHERE uuid_column IS NULL": {
 			"description": {"uuid_column"},
-			"types":       {Uint32ToString(pgtype.ByteaOID)},
+			"types":       {Uint32ToString(pgtype.UUIDOID)},
 			"values":      {""},
 		},
 		"SELECT bytea_column FROM public.test_table WHERE bytea_column IS NOT NULL": {