fixed uuid issue

1NepuNep1 · 1NepuNep1 · commit b2dd6153e1e8 · 2025-10-23T19:19:16.000+03:00
diff --git a/internal/codegen/golang/query.go b/internal/codegen/golang/query.go
@@ -340,7 +340,7 @@ func ydbBuilderMethodForColumnType(dbType string) string {
 	case "tztimestamp":
 		return "TzTimestamp"
 	case "uuid":
-		return "UUID"
+		return "Uuid"
 	case "yson":
 		return "YSON"
 
diff --git a/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/go/models.go b/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/go/query.sql.go b/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/go/query.sql.go
diff --git a/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/overrides_go_types/ydb/ydb-go-sdk/sqlc.json
@@ -9,13 +9,6 @@
       "queries": "query.sql",
       "sql_package": "ydb-go-sdk",
       "overrides": [
-        {
-          "column": "foo.id",
-          "go_type": {
-            "import": "github.com/gofrs/uuid",
-            "type": "UUID"
-          }
-        },
         {
           "column": "foo.other_id",
           "go_type": {
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/query.sql b/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/query.sql
@@ -1,2 +1,3 @@
 -- name: StarExpansionJoin :many
 SELECT * FROM foo, bar;
+
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/schema.sql b/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/schema.sql
@@ -9,3 +9,4 @@ CREATE TABLE bar (
     d Text,
     PRIMARY KEY (c, d)
 );
+
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/sqlc.json b/internal/endtoend/testdata/star_expansion_join/ydb/stdlib/sqlc.json
@@ -10,3 +10,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/query.sql b/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/query.sql
@@ -1,2 +1,3 @@
 -- name: StarExpansionJoin :many
 SELECT * FROM foo, bar;
+
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/schema.sql b/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/schema.sql
@@ -9,3 +9,4 @@ CREATE TABLE bar (
     d Text,
     PRIMARY KEY (c, d)
 );
+
diff --git a/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/star_expansion_join/ydb/ydb-go-sdk/sqlc.json
@@ -11,3 +11,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/query.sql b/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/query.sql
@@ -1,2 +1,3 @@
 -- name: SubqueryCalcColumn :many
 SELECT sum FROM (SELECT a + b AS sum FROM foo) AS f;
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/schema.sql b/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/schema.sql
@@ -3,3 +3,4 @@ CREATE TABLE foo (
     b Int32,
     PRIMARY KEY (a, b)
 );
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/sqlc.json b/internal/endtoend/testdata/subquery_calculated_column/ydb/stdlib/sqlc.json
@@ -10,3 +10,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/query.sql b/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/query.sql
@@ -1,2 +1,3 @@
 -- name: SubqueryCalcColumn :many
 SELECT sum FROM (SELECT a + b AS sum FROM foo) AS f;
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/schema.sql b/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/schema.sql
@@ -3,3 +3,4 @@ CREATE TABLE foo (
     b Int32,
     PRIMARY KEY (a, b)
 );
+
diff --git a/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/subquery_calculated_column/ydb/ydb-go-sdk/sqlc.json
@@ -11,3 +11,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/stdlib/query.sql b/internal/endtoend/testdata/types_uuid/ydb/stdlib/query.sql
@@ -3,3 +3,4 @@ SELECT * FROM foo;
 
 -- name: Find :one
 SELECT bar FROM foo WHERE baz = $baz;
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/stdlib/schema.sql b/internal/endtoend/testdata/types_uuid/ydb/stdlib/schema.sql
@@ -4,3 +4,4 @@ CREATE TABLE foo (
     baz Uuid NOT NULL,
     PRIMARY KEY (baz)
 );
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/stdlib/sqlc.json b/internal/endtoend/testdata/types_uuid/ydb/stdlib/sqlc.json
@@ -10,3 +10,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/query.sql b/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/query.sql
@@ -3,3 +3,4 @@ SELECT * FROM foo;
 
 -- name: Find :one
 SELECT bar FROM foo WHERE baz = $baz;
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/schema.sql b/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/schema.sql
@@ -4,3 +4,4 @@ CREATE TABLE foo (
     baz Uuid NOT NULL,
     PRIMARY KEY (baz)
 );
+
diff --git a/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/types_uuid/ydb/ydb-go-sdk/sqlc.json
@@ -11,3 +11,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/query.sql b/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/query.sql
@@ -1,2 +1,3 @@
 -- name: UpdateSetMultiple :exec
 UPDATE foo SET name = $name, slug = $slug;
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/schema.sql b/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/schema.sql
@@ -3,3 +3,4 @@ CREATE TABLE foo (
     slug Text NOT NULL,
     PRIMARY KEY (name, slug)
 );
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/sqlc.json b/internal/endtoend/testdata/update_set_multiple/ydb/stdlib/sqlc.json
@@ -10,3 +10,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/query.sql b/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/query.sql
@@ -1,2 +1,3 @@
 -- name: UpdateSetMultiple :exec
 UPDATE foo SET name = $name, slug = $slug;
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/schema.sql b/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/schema.sql
@@ -3,3 +3,4 @@ CREATE TABLE foo (
     slug Text NOT NULL,
     PRIMARY KEY (name, slug)
 );
+
diff --git a/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/update_set_multiple/ydb/ydb-go-sdk/sqlc.json
@@ -11,3 +11,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/valid_group_by_reference/ydb/stdlib/schema.sql b/internal/endtoend/testdata/valid_group_by_reference/ydb/stdlib/schema.sql
@@ -25,3 +25,4 @@ CREATE TABLE weather_metrics (
     weather_type_id Int32,
     PRIMARY KEY (time, city_name)
 );
+
diff --git a/internal/endtoend/testdata/valid_group_by_reference/ydb/stdlib/sqlc.json b/internal/endtoend/testdata/valid_group_by_reference/ydb/stdlib/sqlc.json
@@ -10,3 +10,4 @@
     }
   ]
 }
+
diff --git a/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/query.sql b/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/query.sql
@@ -12,3 +12,4 @@ FROM weather_metrics
 WHERE time > DateTime::MakeTimestamp(DateTime::Now()) - Interval("P6M")
 GROUP BY bucket, city_name
 ORDER BY bucket DESC;
+
diff --git a/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/schema.sql b/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/schema.sql
@@ -25,3 +25,4 @@ CREATE TABLE weather_metrics (
     weather_type_id Int32,
     PRIMARY KEY (time, city_name)
 );
+
diff --git a/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/sqlc.json b/internal/endtoend/testdata/valid_group_by_reference/ydb/ydb-go-sdk/sqlc.json
@@ -11,3 +11,4 @@
     }
   ]
 }
+

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`-- name: StarExpansionJoin :many`
`2`	`2`	`SELECT * FROM foo, bar;`
	`3`	`+`
-Original file line number
+Diff line change
     d Text,
     PRIMARY KEY (c, d)
 );
++