Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore!: Rename kyleconroy/sqlc to sqlc-dev/sqlc #2523

Merged
merged 4 commits into from
Jul 26, 2023
Merged

chore!: Rename kyleconroy/sqlc to sqlc-dev/sqlc #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97fa4fb
chore!: Rename kyleconroy/sqlc to sqlc-dev/sqlc
kyleconroy Jul 25, 2023
2abaaa5
chore: Update import paths en masse
kyleconroy Jul 25, 2023
fd2905e
chore(endtoend): Update testdata with new import path
kyleconroy Jul 25, 2023
21d4511
build(endtoend): Clean up testdata go.mod
kyleconroy Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/sqlc-gen-json/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"io"
"os"

"github.com/kyleconroy/sqlc/internal/codegen/json"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/json"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/sqlc/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/kyleconroy/sqlc/internal/cmd"
"github.com/sqlc-dev/sqlc/internal/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/authors/mysql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"database/sql"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestAuthors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/authors/postgresql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"database/sql"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestAuthors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/authors/sqlite/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"database/sql"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestAuthors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/batch/postgresql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestBatchBooks(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/booktest/mysql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestBooks(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/booktest/postgresql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

func TestBooks(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/booktest/sqlite/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"
)

// TODO: Enum is not yet supported
Expand Down
2 changes: 1 addition & 1 deletion examples/ondeck/mysql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"

"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/ondeck/postgresql/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"

"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/ondeck/sqlite/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/kyleconroy/sqlc/internal/sqltest"
"github.com/sqlc-dev/sqlc/internal/sqltest"

"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kyleconroy/sqlc
module github.com/sqlc-dev/sqlc

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion internal/bundler/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bundler
import (
"runtime"

"github.com/kyleconroy/sqlc/internal/info"
"github.com/sqlc-dev/sqlc/internal/info"
)

func projectMetadata() ([][2]string, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/bundler/multipart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

"github.com/kyleconroy/sqlc/internal/config"
"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
)

func writeInputs(w *multipart.Writer, file string, conf *config.Config) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/bundler/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http/httputil"
"os"

"github.com/kyleconroy/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/config"
)

type Uploader struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/spf13/pflag"
"gopkg.in/yaml.v3"

"github.com/kyleconroy/sqlc/internal/config"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/info"
"github.com/kyleconroy/sqlc/internal/opts"
"github.com/kyleconroy/sqlc/internal/tracer"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/info"
"github.com/sqlc-dev/sqlc/internal/opts"
"github.com/sqlc-dev/sqlc/internal/tracer"
)

func init() {
Expand Down
30 changes: 15 additions & 15 deletions internal/cmd/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ import (
"golang.org/x/sync/errgroup"
"google.golang.org/grpc/status"

"github.com/kyleconroy/sqlc/internal/codegen/golang"
"github.com/kyleconroy/sqlc/internal/codegen/json"
"github.com/kyleconroy/sqlc/internal/compiler"
"github.com/kyleconroy/sqlc/internal/config"
"github.com/kyleconroy/sqlc/internal/config/convert"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/ext"
"github.com/kyleconroy/sqlc/internal/ext/process"
"github.com/kyleconroy/sqlc/internal/ext/wasm"
"github.com/kyleconroy/sqlc/internal/info"
"github.com/kyleconroy/sqlc/internal/multierr"
"github.com/kyleconroy/sqlc/internal/opts"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/kyleconroy/sqlc/internal/remote"
"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
"github.com/sqlc-dev/sqlc/internal/codegen/golang"
"github.com/sqlc-dev/sqlc/internal/codegen/json"
"github.com/sqlc-dev/sqlc/internal/compiler"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/config/convert"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/ext"
"github.com/sqlc-dev/sqlc/internal/ext/process"
"github.com/sqlc-dev/sqlc/internal/ext/wasm"
"github.com/sqlc-dev/sqlc/internal/info"
"github.com/sqlc-dev/sqlc/internal/multierr"
"github.com/sqlc-dev/sqlc/internal/opts"
"github.com/sqlc-dev/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/remote"
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
)

const errMessageNoVersion = `The configuration file must have a version number.
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"os"

"github.com/kyleconroy/sqlc/internal/bundler"
"github.com/sqlc-dev/sqlc/internal/bundler"
)

func createPkg(ctx context.Context, e Env, dir, filename string, stderr io.Writer) error {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/shim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package cmd
import (
"strings"

"github.com/kyleconroy/sqlc/internal/compiler"
"github.com/kyleconroy/sqlc/internal/config"
"github.com/kyleconroy/sqlc/internal/config/convert"
"github.com/kyleconroy/sqlc/internal/info"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/kyleconroy/sqlc/internal/sql/catalog"
"github.com/sqlc-dev/sqlc/internal/compiler"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/config/convert"
"github.com/sqlc-dev/sqlc/internal/info"
"github.com/sqlc-dev/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/sql/catalog"
)

func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/vet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"github.com/spf13/cobra"
"google.golang.org/protobuf/encoding/protojson"

"github.com/kyleconroy/sqlc/internal/config"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/opts"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/kyleconroy/sqlc/internal/shfmt"
"github.com/kyleconroy/sqlc/internal/vet"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/opts"
"github.com/sqlc-dev/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/shfmt"
"github.com/sqlc-dev/sqlc/internal/vet"
)

var ErrFailedChecks = errors.New("failed checks")
Expand Down
2 changes: 1 addition & 1 deletion internal/codegen/golang/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"strings"

"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

type Field struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/golang/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"strings"
"text/template"

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

type tmplCtx struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/golang/go_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package golang

import (
"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func addExtraGoStructTags(tags map[string]string, req *plugin.CodeGenRequest, col *plugin.Column) {
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/golang/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sort"
"strings"

"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

type fileImports struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/golang/mysql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package golang
import (
"log"

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/golang/postgresql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"log"
"strings"

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func parseIdentifierString(name string) (*plugin.Identifier, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/golang/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

type QueryValue struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/codegen/golang/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"sort"
"strings"

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/inflection"
"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/inflection"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func buildEnums(req *plugin.CodeGenRequest) []Enum {
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/golang/result_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package golang
import (
"testing"

"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func TestPutOutColumns_ForZeroColumns(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/golang/sqlite_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"log"
"strings"

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/debug"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
"github.com/sqlc-dev/sqlc/internal/debug"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func sqliteType(req *plugin.CodeGenRequest, col *plugin.Column) string {
Expand Down
2 changes: 1 addition & 1 deletion internal/codegen/golang/struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"unicode"
"unicode/utf8"

"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

type Struct struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/codegen/json/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"google.golang.org/protobuf/encoding/protojson"

"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func parseOptions(req *plugin.CodeGenRequest) (*plugin.JSONCode, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/sdk/sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sdk

import (
"github.com/kyleconroy/sqlc/internal/pattern"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/sqlc-dev/sqlc/internal/pattern"
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func DataType(n *plugin.Identifier) string {
Expand Down
Loading
Loading