Merge remote-tracking branch 'upstream/config-v2' into kotlin-master

Author: mightyguava

README.md

@@ -331,14 +331,14 @@ instead.
   "overrides": [
       {
           "go_type": "github.com/gofrs/uuid.UUID",
-          "postgres_type": "uuid"
+          "db_type": "uuid"
       }
   ]
 }
 ```
 
 Each override document has the following keys:
-- `postgres_type`:
+- `db_type`:
   - The PostgreSQL type to override. Find the full list of supported types in [gen.go](https://github.com/kyleconroy/sqlc/blob/master/internal/dinosql/gen.go#L438).
 - `go_type`:
   - A fully qualified name to a Go type to use in the generated code.

examples/authors/db_test.go

@@ -1,3 +1,5 @@
+// +build examples
+
 package authors
 
 import (

examples/authors/sqlc.json

@@ -0,0 +1,16 @@
+{
+  "version": "2",
+  "sql": [
+    {
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "engine": "postgresql",
+      "gen": {
+        "go": {
+          "package": "authors",
+          "out": "."
+        }
+      }
+    }
+  ]
+}

examples/booktest/mysql/models.go

@@ -25,22 +25,13 @@ INSERT INTO books (
     title,
     yr,
     available,
-    tags,
-    is_hardcover,
-    rating,
-    front_cover_img,
-    back_cover_img
+    tags
 ) VALUES (
     ?,
     ?,
     ?,
     ?,
     ?,
-    ?,
-    ?,
-    ?,
-    ?, 
-    ?,
     ?
 );
 

examples/booktest/mysql/query.sql

@@ -19,11 +19,7 @@ CREATE TABLE books (
           title text NOT NULL DEFAULT '',
           yr integer NOT NULL DEFAULT 2000,
           available datetime NOT NULL DEFAULT NOW(),
-          tags text NOT NULL DEFAULT '',
-          is_hardcover BOOL NOT NULL DEFAULT 0,
-          rating decimal(13, 2),
-          front_cover_img varchar(255),
-          back_cover_img varchar(255)
+          tags text NOT NULL DEFAULT ''
           -- CONSTRAINT FOREIGN KEY (author_id) REFERENCES authors(author_id)
 ) ENGINE=InnoDB;
 

examples/booktest/mysql/query.sql.go

@@ -0,0 +1,19 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "name": "booktest",
+      "path": "postgresql",
+      "schema": "postgresql/schema.sql",
+      "queries": "postgresql/query.sql",
+      "engine": "postgresql"
+    },
+    {
+      "name": "booktest",
+      "path": "mysql",
+      "schema": "mysql/schema.sql",
+      "queries": "mysql/query.sql",
+      "engine": "mysql"
+    }
+  ]
+}

examples/booktest/mysql/schema.sql

@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": ".",
+      "name": "jets",
+      "schema": "schema.sql",
+      "queries": "query-building.sql",
+      "engine": "postgresql"
+    }
+  ]
+}

examples/booktest/sqlc.json

@@ -0,0 +1,15 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": ".",
+      "name": "ondeck",
+      "schema": "schema",
+      "queries": "query",
+      "engine": "postgresql",
+      "emit_json_tags": true,
+      "emit_prepared_queries": true,
+      "emit_interface": true
+    }
+  ]
+}