sqlc-dev · kyleconroy · Aug 28, 2020 · Aug 28, 2020 · Aug 28, 2020 · Aug 28, 2020
diff --git a/...rnal/endtoend/testdata/ext_ltree/go/db.go → internal/endtoend/testdata/array_in/go/db.go b/...rnal/endtoend/testdata/ext_ltree/go/db.go → internal/endtoend/testdata/array_in/go/db.go
diff --git a/internal/endtoend/testdata/in/go/models.go → ...l/endtoend/testdata/array_in/go/models.go b/internal/endtoend/testdata/in/go/models.go → ...l/endtoend/testdata/array_in/go/models.go
diff --git a/...rnal/endtoend/testdata/in/go/query.sql.go → ...ndtoend/testdata/array_in/go/query.sql.go b/...rnal/endtoend/testdata/in/go/query.sql.go → ...ndtoend/testdata/array_in/go/query.sql.go
diff --git a/internal/endtoend/testdata/in/query.sql → ...rnal/endtoend/testdata/array_in/query.sql b/internal/endtoend/testdata/in/query.sql → ...rnal/endtoend/testdata/array_in/query.sql
diff --git a/...nal/endtoend/testdata/ext_ltree/sqlc.json → ...rnal/endtoend/testdata/array_in/sqlc.json b/...nal/endtoend/testdata/ext_ltree/sqlc.json → ...rnal/endtoend/testdata/array_in/sqlc.json
diff --git a/...ndtoend/testdata/generate_series/go/db.go → ...nal/endtoend/testdata/array_text/go/db.go b/...ndtoend/testdata/generate_series/go/db.go → ...nal/endtoend/testdata/array_text/go/db.go
diff --git a/...endtoend/testdata/text_array/go/models.go → ...endtoend/testdata/array_text/go/models.go b/...endtoend/testdata/text_array/go/models.go → ...endtoend/testdata/array_text/go/models.go
diff --git a/...toend/testdata/text_array/go/query.sql.go → ...toend/testdata/array_text/go/query.sql.go b/...toend/testdata/text_array/go/query.sql.go → ...toend/testdata/array_text/go/query.sql.go
diff --git a/...al/endtoend/testdata/text_array/query.sql → ...al/endtoend/testdata/array_text/query.sql b/...al/endtoend/testdata/text_array/query.sql → ...al/endtoend/testdata/array_text/query.sql
diff --git a/internal/endtoend/testdata/in/sqlc.json → ...al/endtoend/testdata/array_text/sqlc.json b/internal/endtoend/testdata/in/sqlc.json → ...al/endtoend/testdata/array_text/sqlc.json
diff --git a/internal/endtoend/testdata/in/go/db.go → ...ndtoend/testdata/array_text_join/go/db.go b/internal/endtoend/testdata/in/go/db.go → ...ndtoend/testdata/array_text_join/go/db.go
diff --git a/...end/testdata/join_text_array/go/models.go → ...end/testdata/array_text_join/go/models.go b/...end/testdata/join_text_array/go/models.go → ...end/testdata/array_text_join/go/models.go
diff --git a/.../testdata/join_text_array/go/query.sql.go → .../testdata/array_text_join/go/query.sql.go b/.../testdata/join_text_array/go/query.sql.go → .../testdata/array_text_join/go/query.sql.go
diff --git a/...dtoend/testdata/join_text_array/query.sql → ...dtoend/testdata/array_text_join/query.sql b/...dtoend/testdata/join_text_array/query.sql → ...dtoend/testdata/array_text_join/query.sql
diff --git a/...dtoend/testdata/join_text_array/sqlc.json → ...dtoend/testdata/array_text_join/sqlc.json b/...dtoend/testdata/join_text_array/sqlc.json → ...dtoend/testdata/array_text_join/sqlc.json
diff --git a/internal/endtoend/testdata/dolphin_errors/query/funcs.sql b/internal/endtoend/testdata/dolphin_errors/query/funcs.sql
diff --git a/internal/endtoend/testdata/dolphin_errors/schema.sql b/internal/endtoend/testdata/dolphin_errors/schema.sql
diff --git a/...ndtoend/testdata/join_text_array/go/db.go → ...ndtoend/testdata/join_from/mysql/go/db.go b/...ndtoend/testdata/join_text_array/go/db.go → ...ndtoend/testdata/join_from/mysql/go/db.go
diff --git a/.../endtoend/testdata/multifrom/go/models.go → ...end/testdata/join_from/mysql/go/models.go b/.../endtoend/testdata/multifrom/go/models.go → ...end/testdata/join_from/mysql/go/models.go
diff --git a/internal/endtoend/testdata/join_from/mysql/go/query.sql.go b/internal/endtoend/testdata/join_from/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_from/mysql/query.sql b/internal/endtoend/testdata/join_from/mysql/query.sql
@@ -0,0 +1,5 @@
+CREATE TABLE foo (email text not null);
+CREATE TABLE bar (login text not null);
+
+-- name: MultiFrom :many
+SELECT email FROM bar, foo WHERE login = ?;
diff --git a/...nal/endtoend/testdata/two_joins/sqlc.json → ...dtoend/testdata/join_from/mysql/sqlc.json b/...nal/endtoend/testdata/two_joins/sqlc.json → ...dtoend/testdata/join_from/mysql/sqlc.json
@@ -3,6 +3,7 @@
   "packages": [
     {
       "path": "go",
+      "engine": "mysql:beta",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

diff --git a/internal/endtoend/testdata/json/go/db.go → ...nd/testdata/join_from/postgresql/go/db.go b/internal/endtoend/testdata/json/go/db.go → ...nd/testdata/join_from/postgresql/go/db.go
diff --git a/internal/endtoend/testdata/join_from/postgresql/go/models.go b/internal/endtoend/testdata/join_from/postgresql/go/models.go
diff --git a/...dtoend/testdata/multifrom/go/query.sql.go → ...data/join_from/postgresql/go/query.sql.go b/...dtoend/testdata/multifrom/go/query.sql.go → ...data/join_from/postgresql/go/query.sql.go
diff --git a/...nal/endtoend/testdata/multifrom/query.sql → ...d/testdata/join_from/postgresql/query.sql b/...nal/endtoend/testdata/multifrom/query.sql → ...d/testdata/join_from/postgresql/query.sql
diff --git a/...al/endtoend/testdata/table_name/sqlc.json → ...d/testdata/join_from/postgresql/sqlc.json b/...al/endtoend/testdata/table_name/sqlc.json → ...d/testdata/join_from/postgresql/sqlc.json
@@ -3,6 +3,7 @@
   "packages": [
     {
       "path": "go",
+      "engine": "postgresql",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

diff --git a/...rnal/endtoend/testdata/multifrom/go/db.go → ...d/testdata/join_table_name/mysql/go/db.go b/...rnal/endtoend/testdata/multifrom/go/db.go → ...d/testdata/join_table_name/mysql/go/db.go
diff --git a/internal/endtoend/testdata/join_table_name/mysql/go/models.go b/internal/endtoend/testdata/join_table_name/mysql/go/models.go
diff --git a/internal/endtoend/testdata/join_table_name/mysql/go/query.sql.go b/internal/endtoend/testdata/join_table_name/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_table_name/mysql/query.sql b/internal/endtoend/testdata/join_table_name/mysql/query.sql
@@ -0,0 +1,8 @@
+CREATE TABLE bar (id serial not null);
+CREATE TABLE foo (id serial not null, bar serial references bar(id));
+
+-- name: TableName :one
+SELECT foo.id
+FROM foo
+JOIN bar ON foo.bar = bar.id
+WHERE bar.id = ? AND foo.id = ?;
diff --git a/...nal/endtoend/testdata/multifrom/sqlc.json → .../testdata/join_table_name/mysql/sqlc.json b/...nal/endtoend/testdata/multifrom/sqlc.json → .../testdata/join_table_name/mysql/sqlc.json
@@ -3,6 +3,7 @@
   "packages": [
     {
       "path": "go",
+      "engine": "mysql:beta",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

diff --git a/...nal/endtoend/testdata/table_name/go/db.go → ...tdata/join_table_name/postgresql/go/db.go b/...nal/endtoend/testdata/table_name/go/db.go → ...tdata/join_table_name/postgresql/go/db.go
diff --git a/...endtoend/testdata/table_name/go/models.go → ...a/join_table_name/postgresql/go/models.go b/...endtoend/testdata/table_name/go/models.go → ...a/join_table_name/postgresql/go/models.go
diff --git a/...toend/testdata/table_name/go/query.sql.go → ...oin_table_name/postgresql/go/query.sql.go b/...toend/testdata/table_name/go/query.sql.go → ...oin_table_name/postgresql/go/query.sql.go
diff --git a/...al/endtoend/testdata/table_name/query.sql → ...data/join_table_name/postgresql/query.sql b/...al/endtoend/testdata/table_name/query.sql → ...data/join_table_name/postgresql/query.sql
diff --git a/...al/endtoend/testdata/text_array/sqlc.json → ...data/join_table_name/postgresql/sqlc.json b/...al/endtoend/testdata/text_array/sqlc.json → ...data/join_table_name/postgresql/sqlc.json
@@ -3,6 +3,7 @@
   "packages": [
     {
       "path": "go",
+      "engine": "postgresql",
       "name": "querytest",
       "schema": "query.sql",
       "queries": "query.sql"

diff --git a/...nal/endtoend/testdata/text_array/go/db.go → ...d/testdata/join_two_tables/mysql/go/db.go b/...nal/endtoend/testdata/text_array/go/db.go → ...d/testdata/join_two_tables/mysql/go/db.go
diff --git a/internal/endtoend/testdata/join_two_tables/mysql/go/models.go b/internal/endtoend/testdata/join_two_tables/mysql/go/models.go
diff --git a/...dtoend/testdata/two_joins/go/query.sql.go → ...ata/join_two_tables/mysql/go/query.sql.go b/...dtoend/testdata/two_joins/go/query.sql.go → ...ata/join_two_tables/mysql/go/query.sql.go
diff --git a/...nal/endtoend/testdata/two_joins/query.sql → .../testdata/join_two_tables/mysql/query.sql b/...nal/endtoend/testdata/two_joins/query.sql → .../testdata/join_two_tables/mysql/query.sql
diff --git a/internal/endtoend/testdata/join_two_tables/mysql/sqlc.json b/internal/endtoend/testdata/join_two_tables/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql:beta",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/...rnal/endtoend/testdata/two_joins/go/db.go → ...tdata/join_two_tables/postgresql/go/db.go b/...rnal/endtoend/testdata/two_joins/go/db.go → ...tdata/join_two_tables/postgresql/go/db.go
diff --git a/.../endtoend/testdata/two_joins/go/models.go → ...a/join_two_tables/postgresql/go/models.go b/.../endtoend/testdata/two_joins/go/models.go → ...a/join_two_tables/postgresql/go/models.go
diff --git a/internal/endtoend/testdata/join_two_tables/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_two_tables/postgresql/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_two_tables/postgresql/query.sql b/internal/endtoend/testdata/join_two_tables/postgresql/query.sql
@@ -0,0 +1,9 @@
+CREATE TABLE foo (bar_id serial not null, baz_id serial not null);
+CREATE TABLE bar (id serial not null);
+CREATE TABLE baz (id serial not null);
+
+-- name: TwoJoins :many
+SELECT foo.*
+FROM foo
+JOIN bar ON bar.id = bar_id
+JOIN baz ON baz.id = baz_id;
diff --git a/internal/endtoend/testdata/join_two_tables/postgresql/sqlc.json b/internal/endtoend/testdata/join_two_tables/postgresql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/ondeck/db.go → ...nal/endtoend/testdata/json/mysql/go/db.go b/internal/endtoend/testdata/ondeck/db.go → ...nal/endtoend/testdata/json/mysql/go/db.go
diff --git a/internal/endtoend/testdata/json/mysql/go/models.go b/internal/endtoend/testdata/json/mysql/go/models.go
diff --git a/internal/endtoend/testdata/json/mysql/go/query.sql.go b/internal/endtoend/testdata/json/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/json/mysql/query.sql b/internal/endtoend/testdata/json/mysql/query.sql
@@ -0,0 +1,7 @@
+CREATE TABLE foo (
+    a json not null,
+    b json
+);
+
+-- name: SelectFoo :exec
+SELECT * FROM foo;
diff --git a/internal/endtoend/testdata/json/mysql/sqlc.json b/internal/endtoend/testdata/json/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql:beta",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/json/postgresql/go/db.go b/internal/endtoend/testdata/json/postgresql/go/db.go
diff --git a/internal/endtoend/testdata/json/go/models.go → ...end/testdata/json/postgresql/go/models.go b/internal/endtoend/testdata/json/go/models.go → ...end/testdata/json/postgresql/go/models.go
diff --git a/...al/endtoend/testdata/json/go/query.sql.go → .../testdata/json/postgresql/go/query.sql.go b/...al/endtoend/testdata/json/go/query.sql.go → .../testdata/json/postgresql/go/query.sql.go
diff --git a/internal/endtoend/testdata/json/query.sql → ...dtoend/testdata/json/postgresql/query.sql b/internal/endtoend/testdata/json/query.sql → ...dtoend/testdata/json/postgresql/query.sql
diff --git a/internal/endtoend/testdata/json/postgresql/sqlc.json b/internal/endtoend/testdata/json/postgresql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}