Merge branch 'main' of git://github.com/kyleconroy/sqlc

Author: timwmillard

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1: Build sqlc
-FROM golang:1.16.3 AS builder
+FROM golang:1.16.4 AS builder
 
 COPY . /workspace
 WORKDIR /workspace

docs/howto/select.md

@@ -189,7 +189,7 @@ In PostgreSQL,
 [ANY](https://www.postgresql.org/docs/current/functions-comparisons.html#id-1.5.8.28.16)
 allows you to check if a value exists in an array expression. Queries using ANY
 with a single parameter will generate method signatures with slices as
-arguments.
+arguments. Use the postgres data types, eg: int, varchar, etc.
 
 ```sql
 CREATE TABLE authors (

docs/overview/install.md

@@ -34,11 +34,11 @@ docker run --rm -v $(pwd):/src -w /src kjconroy/sqlc generate
 
 ## Downloads
 
-Get pre-built binaries for *v1.7.0*:
+Get pre-built binaries for *v1.8.0*:
 
-- [Linux](https://github.com/kyleconroy/sqlc/releases/download/v1.7.0/sqlc-v1.7.0-linux-amd64.tar.gz)
-- [macOS](https://github.com/kyleconroy/sqlc/releases/download/v1.7.0/sqlc-v1.7.0-darwin-amd64.zip)
-- [Windows (MySQL only)](https://github.com/kyleconroy/sqlc/releases/download/v1.7.0/sqlc-v1.7.0-windows-amd64.zip)
+- [Linux](https://github.com/kyleconroy/sqlc/releases/download/v1.8.0/sqlc-v1.8.0-linux-amd64.tar.gz)
+- [macOS](https://github.com/kyleconroy/sqlc/releases/download/v1.8.0/sqlc-v1.8.0-darwin-amd64.zip)
+- [Windows (MySQL only)](https://github.com/kyleconroy/sqlc/releases/download/v1.8.0/sqlc-v1.8.0-windows-amd64.zip)
 
 Binaries for a specific release can be downloaded on
 [GitHub](https://github.com/kyleconroy/sqlc/releases).

docs/reference/config.md

@@ -65,7 +65,7 @@ overrides:
 
 Each override document has the following keys:
 - `db_type`:
-  - The PostgreSQL type to override. Find the full list of supported types in [postgresql_type.go](https://github.com/kyleconroy/sqlc/blob/master/internal/codegen/golang/postgresql_type.go#L12).
+  - The PostgreSQL type to override. Find the full list of supported types in [postgresql_type.go](https://github.com/kyleconroy/sqlc/blob/main/internal/codegen/golang/postgresql_type.go#L12).
 - `go_type`:
   - A fully qualified name to a Go type to use in the generated code.
 - `nullable`:

examples/booktest/postgresql/db_test.go

@@ -139,7 +139,7 @@ func TestBooks(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, ab := range res {
-		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name, ab.Isbn, ab.Tags)
+		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name.String, ab.Isbn, ab.Tags)
 	}
 
 	// TODO: call say_hello(varchar)

examples/booktest/postgresql/query.sql.go

@@ -23,7 +23,7 @@ WHERE tags && ?::varchar[]
 data class BooksByTagsRow (
   val bookId: Int,
   val title: String,
-  val name: String,
+  val name: String?,
   val isbn: String,
   val tags: List<String>
 )

examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt

@@ -27,7 +27,7 @@
 class BooksByTagsRow:
     book_id: int
     title: str
-    name: str
+    name: Optional[str]
     isbn: str
     tags: List[str]
 

examples/python/src/booktest/query.py

@@ -50,7 +50,7 @@ var versionCmd = &cobra.Command{
 		if version == "" {
 			// When no version is set, return the next bug fix version
 			// after the most recent tag
-			fmt.Printf("%s\n", "v1.7.1-devel")
+			fmt.Printf("%s\n", "v1.8.1-devel")
 		} else {
 			fmt.Printf("%s\n", version)
 		}

internal/cmd/cmd.go

@@ -427,21 +427,39 @@ func generate(settings config.CombinedSettings, enums []Enum, structs []Struct,
 			fmt.Println(b.String())
 			return fmt.Errorf("source error: %w", err)
 		}
+
+		if templateName == "queryFile" && golang.OutputFilesSuffix != "" {
+			name += golang.OutputFilesSuffix
+		}
+
 		if !strings.HasSuffix(name, ".go") {
 			name += ".go"
 		}
 		output[name] = string(code)
 		return nil
 	}
 
-	if err := execute("db.go", "dbFile"); err != nil {
+	dbFileName := "db.go"
+	if golang.OutputDBFileName != "" {
+		dbFileName = golang.OutputDBFileName
+	}
+	modelsFileName := "models.go"
+	if golang.OutputModelsFileName != "" {
+		modelsFileName = golang.OutputModelsFileName
+	}
+	querierFileName := "querier.go"
+	if golang.OutputQuerierFileName != "" {
+		querierFileName = golang.OutputQuerierFileName
+	}
+
+	if err := execute(dbFileName, "dbFile"); err != nil {
 		return nil, err
 	}
-	if err := execute("models.go", "modelsFile"); err != nil {
+	if err := execute(modelsFileName, "modelsFile"); err != nil {
 		return nil, err
 	}
 	if golang.EmitInterface {
-		if err := execute("querier.go", "interfaceFile"); err != nil {
+		if err := execute(querierFileName, "interfaceFile"); err != nil {
 			return nil, err
 		}
 	}