revert unrelated import string prefix change, and add pgx tests

Author: andrewmbenton

internal/codegen/golang/imports.go

@@ -460,9 +460,15 @@ func (i *importer) batchImports() fileImports {
 	return sortedImports(std, pkg)
 }
 
+func trimSliceAndPointerPrefix(v string) string {
+	v = strings.TrimPrefix(v, "[]")
+	v = strings.TrimPrefix(v, "*")
+	return v
+}
+
 func hasPrefixIgnoringSliceAndPointerPrefix(s, prefix string) bool {
-	trimmedS := strings.TrimLeft(s, "*[]")
-	trimmedPrefix := strings.TrimLeft(prefix, "*[]")
+	trimmedS := trimSliceAndPointerPrefix(s)
+	trimmedPrefix := trimSliceAndPointerPrefix(prefix)
 	return strings.HasPrefix(trimmedS, trimmedPrefix)
 }
 

internal/endtoend/testdata/overrides_array/postgresql/pgx/v4/query.sql

@@ -0,0 +1,11 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text,
+  tags string[]
+);
+
+-- name: GetAuthor :one
+SELECT * FROM authors
+WHERE id = $1 LIMIT 1;

internal/endtoend/testdata/overrides_array/postgresql/pgx/v4/query/db.go

@@ -0,0 +1,23 @@
+{
+    "version": "2",
+    "sql": [{
+        "schema": "query.sql",
+        "queries": "query.sql",
+        "engine": "postgresql",
+        "gen": {
+            "go": {
+                "sql_package": "pgx/v4",
+                "package": "query",
+                "out": "query",
+                "overrides": [{
+                    "column": "authors.tags",
+                    "go_type": {
+                      "type": "NullInt64",
+                      "import": "database/sql",
+                      "slice": true
+                    }
+                }]
+            }
+        }
+    }]
+}

internal/endtoend/testdata/overrides_array/postgresql/pgx/v4/query/models.go

@@ -0,0 +1,11 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text,
+  tags string[]
+);
+
+-- name: GetAuthor :one
+SELECT * FROM authors
+WHERE id = $1 LIMIT 1;

internal/endtoend/testdata/overrides_array/postgresql/pgx/v4/query/query.sql.go

@@ -0,0 +1,23 @@
+{
+    "version": "2",
+    "sql": [{
+        "schema": "query.sql",
+        "queries": "query.sql",
+        "engine": "postgresql",
+        "gen": {
+            "go": {
+              "sql_package": "pgx/v5",
+              "package": "query",
+              "out": "query",
+              "overrides": [{
+                "column": "authors.tags",
+                "go_type": {
+                  "type": "NullInt64",
+                  "import": "database/sql",
+                  "slice": true
+                }
+              }]
+            }
+      }
+    }]
+  }