chore: Finish migration to sqlc-dev/sqlc (#2548)

kyleconroy · web-flow · commit 3b482286918f · 2023-07-31T08:21:16.000-07:00
diff --git a/Makefile b/Makefile
@@ -49,6 +49,6 @@ proto:
 
 remote-proto:
 	protoc \
-		--go_out=. --go_opt="Minternal/remote/gen.proto=github.com/kyleconroy/sqlc/internal/remote" --go_opt=module=github.com/kyleconroy/sqlc \
-        --go-grpc_out=. --go-grpc_opt="Minternal/remote/gen.proto=github.com/kyleconroy/sqlc/internal/remote" --go-grpc_opt=module=github.com/kyleconroy/sqlc \
+		--go_out=. --go_opt="Minternal/remote/gen.proto=github.com/sqlc-dev/sqlc/internal/remote" --go_opt=module=github.com/sqlc-dev/sqlc \
+        --go-grpc_out=. --go-grpc_opt="Minternal/remote/gen.proto=github.com/sqlc-dev/sqlc/internal/remote" --go-grpc_opt=module=github.com/sqlc-dev/sqlc \
         internal/remote/gen.proto
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # sqlc: A SQL Compiler
 
-![go](https://github.com/kyleconroy/sqlc/workflows/go/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kyleconroy/sqlc)](https://goreportcard.com/report/github.com/kyleconroy/sqlc)
+![go](https://github.com/sqlc-dev/sqlc/workflows/go/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/sqlc-dev/sqlc)](https://goreportcard.com/report/github.com/sqlc-dev/sqlc)
 
 sqlc generates **type-safe code** from SQL. Here's how it works:
 
diff --git a/cliff.toml b/cliff.toml
@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file.\n
 # https://tera.netlify.app/docs/#introduction
 body = """
 {% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}](https://github.com/kyleconroy/sqlc/releases/tag/{{ version }})
+    ## [{{ version | trim_start_matches(pat="v") }}](https://github.com/sqlc-dev/sqlc/releases/tag/{{ version }})
 {% else %}\
     ## [unreleased]
 {% endif %}\
diff --git a/docs/overview/install.md b/docs/overview/install.md
@@ -19,13 +19,13 @@ sudo snap install sqlc
 ### Go >= 1.17:
 
 ```
-go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
 ```
 
 ### Go < 1.17:
 
 ```
-go get github.com/kyleconroy/sqlc/cmd/sqlc
+go get github.com/sqlc-dev/sqlc/cmd/sqlc
 ```
 
 ## Docker
diff --git a/internal/config/override.go b/internal/config/override.go
@@ -14,7 +14,7 @@ type Override struct {
 	GoType GoType `json:"go_type" yaml:"go_type"`
 
 	// additional Go struct tags to add to this field, in raw Go struct tag form, e.g. `validate:"required" x:"y,z"`
-	// see https://github.com/kyleconroy/sqlc/issues/534
+	// see https://github.com/sqlc-dev/sqlc/issues/534
 	GoStructTag GoStructTag `json:"go_struct_tag" yaml:"go_struct_tag"`
 
 	// fully qualified name of the Go type, e.g. `github.com/segmentio/ksuid.KSUID`
diff --git a/internal/endtoend/testdata/case_named_params/mysql/query.sql b/internal/endtoend/testdata/case_named_params/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1195
+-- https://github.com/sqlc-dev/sqlc/issues/1195
 
 CREATE TABLE authors (
   id   BIGINT PRIMARY KEY,
diff --git a/internal/endtoend/testdata/case_named_params/postgresql/query.sql b/internal/endtoend/testdata/case_named_params/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1195
+-- https://github.com/sqlc-dev/sqlc/issues/1195
 
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
diff --git a/internal/endtoend/testdata/go.mod b/internal/endtoend/testdata/go.mod
@@ -1,4 +1,4 @@
-module github.com/kyleconroy/sqlc/endtoend
+module github.com/sqlc-dev/sqlc/endtoend
 
 go 1.18
 
diff --git a/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql b/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql b/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
   name text      NOT NULL,
diff --git a/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql b/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/mysql/query.sql b/internal/endtoend/testdata/join_left/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/604
+-- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -29,7 +29,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -78,7 +78,7 @@ FROM    authors a
         LEFT JOIN super_authors sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE users_2 (
     user_id           INT PRIMARY KEY,
     user_nickname     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/postgresql/query.sql b/internal/endtoend/testdata/join_left/postgresql/query.sql
@@ -1,4 +1,4 @@
---- https://github.com/kyleconroy/sqlc/issues/604
+--- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -28,7 +28,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -77,7 +77,7 @@ FROM    authors a
         LEFT JOIN super_authors sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE "users_2" (
     "user_id"           uuid PRIMARY KEY,
     "user_nickname"     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/sqlite/query.sql b/internal/endtoend/testdata/join_left/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/604
+-- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -29,7 +29,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -78,7 +78,7 @@ FROM    authors AS a
         LEFT JOIN super_authors AS sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE users_2 (
     user_id           INT PRIMARY KEY,
     user_nickname     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/missing_semicolon/mysql/query.sql b/internal/endtoend/testdata/missing_semicolon/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1198
+-- https://github.com/sqlc-dev/sqlc/issues/1198
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql b/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/921
+-- https://github.com/sqlc-dev/sqlc/issues/921
 CREATE TABLE authors (
   id   BIGINT  NOT NULL AUTO_INCREMENT PRIMARY KEY,
   name text    NOT NULL,
diff --git a/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql b/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/921
+-- https://github.com/sqlc-dev/sqlc/issues/921
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
   name text      NOT NULL UNIQUE,
diff --git a/internal/endtoend/testdata/single_param_conflict/mysql/query.sql b/internal/endtoend/testdata/single_param_conflict/mysql/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = ?
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub TEXT PRIMARY KEY
 );
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql b/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = ?
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub TEXT PRIMARY KEY
 );
diff --git a/internal/endtoend/testdata/update_two_table/mysql/query.sql b/internal/endtoend/testdata/update_two_table/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1590
+-- https://github.com/sqlc-dev/sqlc/issues/1590
 CREATE TABLE authors (
   name text NOT NULL,
   deleted_at datetime NOT NULL,
diff --git a/internal/endtoend/testdata/upsert/sqlite/query.sql b/internal/endtoend/testdata/upsert/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1728
+-- https://github.com/sqlc-dev/sqlc/issues/1728
 
 CREATE TABLE IF NOT EXISTS locations (
     id              INTEGER PRIMARY KEY,
diff --git a/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql b/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql
@@ -16,7 +16,7 @@ FROM     authors
 GROUP BY name;
 
 
--- https://github.com/kyleconroy/sqlc/issues/1315
+-- https://github.com/sqlc-dev/sqlc/issues/1315
 
 CREATE TABLE IF NOT EXISTS weather_metrics
 (
diff --git a/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql b/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql
@@ -15,7 +15,7 @@ FROM     authors
 GROUP BY name;
 
 
--- https://github.com/kyleconroy/sqlc/issues/1315
+-- https://github.com/sqlc-dev/sqlc/issues/1315
 
 CREATE TABLE IF NOT EXISTS weather_metrics
 (
diff --git a/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json b/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json
@@ -17,7 +17,7 @@
     {
       "name": "greeter",
       "wasm": {
-        "url": "https://github.com/kyleconroy/sqlc-gen-greeter/releases/download/v0.1.0/sqlc-gen-greeter.wasm",
+        "url": "https://github.com/sqlc-dev/sqlc-gen-greeter/releases/download/v0.1.0/sqlc-gen-greeter.wasm",
         "sha256": "afc486dac2068d741d7a4110146559d12a013fd0286f42a2fc7dcd802424ad07"
       }
     }
diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go
@@ -197,7 +197,7 @@ func (r *Runner) loadWASM(ctx context.Context, cache string, expected string) ([
 // removePGCatalog removes the pg_catalog schema from the request. There is a
 // mysterious (reason unknown) bug with wasm plugins when a large amount of
 // tables (like there are in the catalog) are sent.
-// @see https://github.com/kyleconroy/sqlc/pull/1748
+// @see https://github.com/sqlc-dev/sqlc/pull/1748
 func removePGCatalog(req *plugin.CodeGenRequest) {
 	if req.Catalog == nil || req.Catalog.Schemas == nil {
 		return
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
@@ -20,21 +20,21 @@ func Singular(s SingularParams) string {
 
 	// Manual fix for incorrect handling of "campus"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/430
+	// https://github.com/sqlc-dev/sqlc/issues/430
 	// https://github.com/jinzhu/inflection/issues/13
 	if strings.ToLower(s.Name) == "campus" {
 		return s.Name
 	}
 	// Manual fix for incorrect handling of "meta"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/1217
+	// https://github.com/sqlc-dev/sqlc/issues/1217
 	// https://github.com/jinzhu/inflection/issues/21
 	if strings.ToLower(s.Name) == "meta" {
 		return s.Name
 	}
 	// Manual fix for incorrect handling of "calories"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/2017
+	// https://github.com/sqlc-dev/sqlc/issues/2017
 	// https://github.com/jinzhu/inflection/issues/23
 	if strings.ToLower(s.Name) == "calories" {
 		return "calorie"
diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/internal/tools/sqlc-pg-gen/main.go b/internal/tools/sqlc-pg-gen/main.go
@@ -48,8 +48,8 @@ const catalogTmpl = `
 package {{.Pkg}}
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcs{{.GenFnName}} = []*catalog.Function {
@@ -119,8 +119,8 @@ const loaderFuncTmpl = `
 package postgresql
 
 import (
-	"github.com/kyleconroy/sqlc/internal/engine/postgresql/contrib"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/engine/postgresql/contrib"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func loadExtension(name string) *catalog.Schema {
diff --git a/internal/tools/sqlc-pg-gen/proc.go b/internal/tools/sqlc-pg-gen/proc.go
diff --git a/internal/vet/vet.pb.go b/internal/vet/vet.pb.go
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
diff --git a/placeholder.go b/placeholder.go
diff --git a/protos/buf.yaml b/protos/buf.yaml
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
diff --git a/protos/vet/vet.proto b/protos/vet/vet.proto
diff --git a/scripts/build/main.go b/scripts/build/main.go
diff --git a/scripts/release.go b/scripts/release.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- https://github.com/kyleconroy/sqlc/issues/1195`
	`1`	`+-- https://github.com/sqlc-dev/sqlc/issues/1195`
`2`	`2`
`3`	`3`	`CREATE TABLE authors (`
`4`	`4`	`id BIGINT PRIMARY KEY,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/kyleconroy/sqlc/endtoend`
	`1`	`+module github.com/sqlc-dev/sqlc/endtoend`
`2`	`2`
`3`	`3`	`go 1.18`
`4`	`4`