and update tests

andrewmbenton · andrewmbenton · commit 5611a92e21ec · 2025-08-11T14:49:11.000-07:00
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/mysql/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/mysql/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/mysql/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/mysql/schema.sql
@@ -1,6 +1,7 @@
 CREATE TABLE foo (
     other     text NOT NULL,
-    tagged    text NOT NULL
+    tagged    text NOT NULL,
+    nulltext text
 );
 
 CREATE TABLE bar (
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/mysql/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/mysql/sqlc.json
@@ -18,7 +18,13 @@
         },
         {
           "db_type": "text",
-          "go_struct_tag": "utype:\"text\""
+          "go_struct_tag": "utype:\"notnull_text\""
+        },
+        {
+          "db_type": "text",
+          "go_type": "string",
+          "nullable": true,
+          "go_struct_tag": "utype:\"nullable_text\""
         }
       ]
     }
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/schema.sql
@@ -2,7 +2,8 @@ CREATE TABLE foo (
     id       text,
     other_id text,
     about    text,
-    other    text
+    other    text,
+    notnulltext text not null
 );
 
 CREATE TABLE bar (
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/sqlc.json
@@ -35,7 +35,13 @@
         },
         {
           "db_type": "text",
-          "go_struct_tag": "utype:\"text\""
+          "go_struct_tag": "utype:\"notnull_text\""
+        },
+        {
+          "db_type": "text",
+          "go_type": "string",
+          "nullable": true,
+          "go_struct_tag": "utype:\"nullable_text\""
         }
       ]
     }
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/schema.sql
@@ -2,7 +2,8 @@ CREATE TABLE foo (
     id       text,
     other_id text,
     about    text,
-    other    text
+    other    text,
+    notnulltext text not null
 );
 
 CREATE TABLE bar (
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/sqlc.json
@@ -35,7 +35,13 @@
         },
         {
           "db_type": "text",
-          "go_struct_tag": "utype:\"text\""
+          "go_struct_tag": "utype:\"notnull_text\""
+        },
+        {
+          "db_type": "text",
+          "go_type": "string",
+          "nullable": true,
+          "go_struct_tag": "utype:\"nullable_text\""
         }
       ]
     }
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/schema.sql
@@ -1,4 +1,5 @@
 CREATE TABLE foo (
     id       text,
-    other_id text
+    other_id text,
+    notnulltext text not null
 );
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/sqlc.json
@@ -14,7 +14,13 @@
         },
         {
           "db_type": "text",
-          "go_struct_tag": "utype:\"text\""
+          "go_struct_tag": "utype:\"notnull_text\""
+        },
+        {
+          "db_type": "text",
+          "go_type": "string",
+          "nullable": true,
+          "go_struct_tag": "utype:\"nullable_text\""
         }
       ]
     }
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/schema.sql b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/schema.sql
@@ -1,7 +1,8 @@
 CREATE TABLE foo (
     other     text NOT NULL,
     tagged    text NOT NULL,
-    tag3      text NOT NULL
+    tag3      text NOT NULL,
+    nulltext text
 );
 
 CREATE TABLE bar (
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/sqlc.json b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/sqlc.json
@@ -22,7 +22,13 @@
         },
         {
           "db_type": "text",
-          "go_struct_tag": "utype:\"text\""
+          "go_struct_tag": "utype:\"notnull_text\""
+        },
+        {
+          "db_type": "text",
+          "go_type": "string",
+          "nullable": true,
+          "go_struct_tag": "utype:\"nullable_text\""
         }
       ]
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,13 @@`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`"db_type": "text",`
`21`		`- "go_struct_tag": "utype:\"text\""`
	`21`	`+ "go_struct_tag": "utype:\"notnull_text\""`
	`22`	`+ },`
	`23`	`+ {`
	`24`	`+ "db_type": "text",`
	`25`	`+ "go_type": "string",`
	`26`	`+ "nullable": true,`
	`27`	`+ "go_struct_tag": "utype:\"nullable_text\""`
`22`	`28`	`}`
`23`	`29`	`]`
`24`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,13 @@`
`35`	`35`	`},`
`36`	`36`	`{`
`37`	`37`	`"db_type": "text",`
`38`		`- "go_struct_tag": "utype:\"text\""`
	`38`	`+ "go_struct_tag": "utype:\"notnull_text\""`
	`39`	`+ },`
	`40`	`+ {`
	`41`	`+ "db_type": "text",`
	`42`	`+ "go_type": "string",`
	`43`	`+ "nullable": true,`
	`44`	`+ "go_struct_tag": "utype:\"nullable_text\""`
`39`	`45`	`}`
`40`	`46`	`]`
`41`	`47`	`}`