From 610aa9ccb25a9aacddcab4c3aa5cc20c778b551b Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 26 Oct 2022 00:50:56 -0700 Subject: [PATCH 1/3] Update sqlc.json --- examples/kotlin/sqlc.json | 85 ++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 28 deletions(-) diff --git a/examples/kotlin/sqlc.json b/examples/kotlin/sqlc.json index f7f8f0b61d..813688e20c 100644 --- a/examples/kotlin/sqlc.json +++ b/examples/kotlin/sqlc.json @@ -1,82 +1,111 @@ { "version": "2", + "plugins": [ + { + "name": "kt", + "process": { + "cmd": "sqlc-gen-kotlin" + } + } + ], "sql": [ { "schema": "src/main/resources/authors/postgresql/schema.sql", "queries": "src/main/resources/authors/postgresql/query.sql", "engine": "postgresql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/authors/postgresql", - "package": "com.example.authors.postgresql" + "plugin": "kt", + "options": { + "package": "com.example.authors.postgresql" + } } - } + ] }, { "schema": "src/main/resources/ondeck/postgresql/schema", "queries": "src/main/resources/ondeck/postgresql/query", "engine": "postgresql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/ondeck/postgresql", - "package": "com.example.ondeck.postgresql" + "plugin": "kt", + "options": { + "package": "com.example.ondeck.postgresql" + } } - } + ] }, { "schema": "src/main/resources/jets/schema.sql", "queries": "src/main/resources/jets/query-building.sql", "engine": "postgresql", - "gen": { - "kotlin": { + "codegen": [ + { + "plugin": "kt", "out": "src/main/kotlin/com/example/jets", - "package": "com.example.jets" + "options": { + "package": "com.example.jets" + } } - } + ] }, { "schema": "src/main/resources/booktest/postgresql/schema.sql", "queries": "src/main/resources/booktest/postgresql/query.sql", "engine": "postgresql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/booktest/postgresql", - "package": "com.example.booktest.postgresql" + "plugin": "kt", + "options": { + "package": "com.example.booktest.postgresql" + } } - } + ] }, { "schema": "src/main/resources/authors/mysql/schema.sql", "queries": "src/main/resources/authors/mysql/query.sql", "engine": "mysql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/authors/mysql", - "package": "com.example.authors.mysql" + "plugin": "kt", + "options": { + "package": "com.example.authors.mysql" + } } - } + ] }, { "schema": "src/main/resources/booktest/mysql/schema.sql", "queries": "src/main/resources/booktest/mysql/query.sql", "engine": "mysql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/booktest/mysql", - "package": "com.example.booktest.mysql" + "plugin": "kt", + "options": { + "package": "com.example.booktest.mysql" + } } - } + ] }, { "schema": "src/main/resources/ondeck/mysql/schema", "queries": "src/main/resources/ondeck/mysql/query", "engine": "mysql", - "gen": { - "kotlin": { + "codegen": [ + { "out": "src/main/kotlin/com/example/ondeck/mysql", - "package": "com.example.ondeck.mysql" + "plugin": "kt", + "options": { + "package": "com.example.ondeck.mysql" + } } - } + ] } ] } From f13076f99e800377f76c74eab4eeccaa6111bec5 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 26 Oct 2022 01:28:14 -0700 Subject: [PATCH 2/3] Development build --- examples/kotlin/sqlc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/kotlin/sqlc.json b/examples/kotlin/sqlc.json index 813688e20c..2a1ae78170 100644 --- a/examples/kotlin/sqlc.json +++ b/examples/kotlin/sqlc.json @@ -3,8 +3,9 @@ "plugins": [ { "name": "kt", - "process": { - "cmd": "sqlc-gen-kotlin" + "wasm": { + "url": "file:///Users/kyle/projects/sqlc-gen-kotlin/plugin/sqlc-gen-kotlin.wasm", + "sha256": "8c18cbef4da156c4d419bed331e0dab4be835b2cb7bee578607df40c3c35b42f" } } ], From 0b0dfed26f4831bb89ca1eb56accf0cf737cd0cc Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 8 Nov 2022 20:00:53 -0800 Subject: [PATCH 3/3] kotlin: Upgrade to v1.0.0 --- docs/guides/migrating-to-sqlc-gen-kotlin.md | 8 ++++---- examples/kotlin/sqlc.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/guides/migrating-to-sqlc-gen-kotlin.md b/docs/guides/migrating-to-sqlc-gen-kotlin.md index add5754e96..d47f9794e5 100644 --- a/docs/guides/migrating-to-sqlc-gen-kotlin.md +++ b/docs/guides/migrating-to-sqlc-gen-kotlin.md @@ -22,8 +22,8 @@ already. Add the following configuration for the plugin: { "name": "kt", "wasm": { - "url": "https://downloads.sqlc.dev/plugins/sqlc-gen-kotlin_0.16.0.wasm", - "sha256": "FIXME" + "url": "https://downloads.sqlc.dev/plugin/sqlc-gen-kotlin_1.0.0.wasm", + "sha256": "7620dc5d462de41fdc90e2011232c842117b416c98fd5c163d27c5738431a45c" } } ] @@ -35,8 +35,8 @@ version: "2" plugins: name: "kt" wasm: - url: "https://downloads.sqlc.dev/plugins/sqlc-gen-kotlin_0.16.0.wasm" - sha256: "FIXME" + url: "https://downloads.sqlc.dev/plugin/sqlc-gen-kotlin_1.0.0.wasm" + sha256: "7620dc5d462de41fdc90e2011232c842117b416c98fd5c163d27c5738431a45c" ``` ## Migrate each package diff --git a/examples/kotlin/sqlc.json b/examples/kotlin/sqlc.json index 2a1ae78170..3113b7a246 100644 --- a/examples/kotlin/sqlc.json +++ b/examples/kotlin/sqlc.json @@ -4,8 +4,8 @@ { "name": "kt", "wasm": { - "url": "file:///Users/kyle/projects/sqlc-gen-kotlin/plugin/sqlc-gen-kotlin.wasm", - "sha256": "8c18cbef4da156c4d419bed331e0dab4be835b2cb7bee578607df40c3c35b42f" + "url": "https://downloads.sqlc.dev/plugin/sqlc-gen-kotlin_1.0.0.wasm", + "sha256": "7620dc5d462de41fdc90e2011232c842117b416c98fd5c163d27c5738431a45c" } } ],