From a79bfebdea5b808f09d130e3e4d2ed8428a58362 Mon Sep 17 00:00:00 2001 From: ichizero <30754019+ichizero@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:48:12 +0900 Subject: [PATCH] chore: Update examples --- examples/sqlc.yaml | 5 +- .../com/example/authors/mysql/QueriesImpl.kt | 12 ++--- .../example/authors/postgresql/QueriesImpl.kt | 18 ++++---- .../com/example/booktest/mysql/QueriesImpl.kt | 38 +++++++-------- .../booktest/postgresql/QueriesImpl.kt | 46 +++++++++---------- .../kotlin/com/example/jets/QueriesImpl.kt | 6 +-- .../com/example/ondeck/mysql/QueriesImpl.kt | 44 +++++++++--------- .../example/ondeck/postgresql/QueriesImpl.kt | 44 +++++++++--------- 8 files changed, 106 insertions(+), 107 deletions(-) diff --git a/examples/sqlc.yaml b/examples/sqlc.yaml index 8a129bf..211fad8 100644 --- a/examples/sqlc.yaml +++ b/examples/sqlc.yaml @@ -1,9 +1,8 @@ version: '2' plugins: - name: kt - wasm: - url: https://downloads.sqlc.dev/plugin/sqlc-gen-kotlin_1.2.0.wasm - sha256: 22b437ecaea66417bbd3b958339d9868ba89368ce542c936c37305acf373104b + process: + cmd: ../bin/sqlc-gen-kotlin sql: - schema: src/main/resources/authors/postgresql/schema.sql queries: src/main/resources/authors/postgresql/query.sql diff --git a/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt index 29edfe7..38e755b 100644 --- a/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt @@ -68,9 +68,9 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getLong(1), - results.getString(2), - results.getString(3) + results.getObject(1) as Long, + results.getObject(2) as String, + results.getObject(3) as String? ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -87,9 +87,9 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Author( - results.getLong(1), - results.getString(2), - results.getString(3) + results.getObject(1) as Long, + results.getObject(2) as String, + results.getObject(3) as String? )) } ret diff --git a/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt index fe0338a..896d396 100644 --- a/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt @@ -45,9 +45,9 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getLong(1), - results.getString(2), - results.getString(3) + results.getObject(1) as Long, + results.getObject(2) as String, + results.getObject(3) as String? ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -75,9 +75,9 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getLong(1), - results.getString(2), - results.getString(3) + results.getObject(1) as Long, + results.getObject(2) as String, + results.getObject(3) as String? ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -94,9 +94,9 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Author( - results.getLong(1), - results.getString(2), - results.getString(3) + results.getObject(1) as Long, + results.getObject(2) as String, + results.getObject(3) as String? )) } ret diff --git a/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt index c5ca6e4..349bf89 100644 --- a/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt @@ -101,11 +101,11 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(BooksByTagsRow( - results.getInt(1), - results.getString(2), - results.getString(3), - results.getString(4), - results.getString(5) + results.getObject(1) as Int, + results.getObject(2) as String, + results.getObject(3) as String?, + results.getObject(4) as String, + results.getObject(5) as String )) } ret @@ -122,14 +122,14 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Book( - results.getInt(1), - results.getInt(2), - results.getString(3), + results.getObject(1) as Int, + results.getObject(2) as Int, + results.getObject(3) as String, BooksBookType.lookup(results.getString(4))!!, - results.getString(5), - results.getInt(6), + results.getObject(5) as String, + results.getObject(6) as Int, results.getObject(7, LocalDateTime::class.java), - results.getString(8) + results.getObject(8) as String )) } ret @@ -208,8 +208,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getInt(1), - results.getString(2) + results.getObject(1) as Int, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -228,14 +228,14 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Book( - results.getInt(1), - results.getInt(2), - results.getString(3), + results.getObject(1) as Int, + results.getObject(2) as Int, + results.getObject(3) as String, BooksBookType.lookup(results.getString(4))!!, - results.getString(5), - results.getInt(6), + results.getObject(5) as String, + results.getObject(6) as Int, results.getObject(7, LocalDateTime::class.java), - results.getString(8) + results.getObject(8) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") diff --git a/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt index 8e3f3c3..c3c5d13 100644 --- a/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt @@ -99,10 +99,10 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(BooksByTagsRow( - results.getInt(1), - results.getString(2), - results.getString(3), - results.getString(4), + results.getObject(1) as Int, + results.getObject(2) as String, + results.getObject(3) as String?, + results.getObject(4) as String, (results.getArray(5).array as Array).toList() )) } @@ -120,12 +120,12 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Book( - results.getInt(1), - results.getInt(2), - results.getString(3), + results.getObject(1) as Int, + results.getObject(2) as Int, + results.getObject(3) as String, BookType.lookup(results.getString(4))!!, - results.getString(5), - results.getInt(6), + results.getObject(5) as String, + results.getObject(6) as Int, results.getObject(7, OffsetDateTime::class.java), (results.getArray(8).array as Array).toList() )) @@ -144,8 +144,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getInt(1), - results.getString(2) + results.getObject(1) as Int, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -177,12 +177,12 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Book( - results.getInt(1), - results.getInt(2), - results.getString(3), + results.getObject(1) as Int, + results.getObject(2) as Int, + results.getObject(3) as String, BookType.lookup(results.getString(4))!!, - results.getString(5), - results.getInt(6), + results.getObject(5) as String, + results.getObject(6) as Int, results.getObject(7, OffsetDateTime::class.java), (results.getArray(8).array as Array).toList() ) @@ -212,8 +212,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Author( - results.getInt(1), - results.getString(2) + results.getObject(1) as Int, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -232,12 +232,12 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Book( - results.getInt(1), - results.getInt(2), - results.getString(3), + results.getObject(1) as Int, + results.getObject(2) as Int, + results.getObject(3) as String, BookType.lookup(results.getString(4))!!, - results.getString(5), - results.getInt(6), + results.getObject(5) as String, + results.getObject(6) as Int, results.getObject(7, OffsetDateTime::class.java), (results.getArray(8).array as Array).toList() ) diff --git a/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt b/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt index 5760a0e..016fb0f 100644 --- a/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt @@ -30,7 +30,7 @@ class QueriesImpl(private val conn: Connection) : Queries { if (!results.next()) { return null } - val ret = results.getLong(1) + val ret = results.getObject(1) as Long if (results.next()) { throw SQLException("expected one row in result set, but got many") } @@ -55,8 +55,8 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Pilot( - results.getInt(1), - results.getString(2) + results.getObject(1) as Int, + results.getObject(2) as String )) } ret diff --git a/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt index 9965de0..ce78f3a 100644 --- a/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt @@ -158,8 +158,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = City( - results.getString(1), - results.getString(2) + results.getObject(1) as String, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -179,15 +179,15 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Venue( - results.getLong(1), + results.getObject(1) as Long, VenueStatus.lookup(results.getString(2))!!, - results.getString(3), - results.getString(4), - results.getString(5), - results.getString(6), - results.getString(7), - results.getString(8), - results.getString(9), + results.getObject(3) as String?, + results.getObject(4) as String, + results.getObject(5) as String, + results.getObject(6) as String, + results.getObject(7) as String, + results.getObject(8) as String?, + results.getObject(9) as String?, results.getTimestamp(10).toInstant() ) if (results.next()) { @@ -205,8 +205,8 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(City( - results.getString(1), - results.getString(2) + results.getObject(1) as String, + results.getObject(2) as String )) } ret @@ -222,15 +222,15 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Venue( - results.getLong(1), + results.getObject(1) as Long, VenueStatus.lookup(results.getString(2))!!, - results.getString(3), - results.getString(4), - results.getString(5), - results.getString(6), - results.getString(7), - results.getString(8), - results.getString(9), + results.getObject(3) as String?, + results.getObject(4) as String, + results.getObject(5) as String, + results.getObject(6) as String, + results.getObject(7) as String, + results.getObject(8) as String?, + results.getObject(9) as String?, results.getTimestamp(10).toInstant() )) } @@ -266,8 +266,8 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(VenueCountByCityRow( - results.getString(1), - results.getLong(2) + results.getObject(1) as String, + results.getObject(2) as Long )) } ret diff --git a/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt index 1519d78..8be5df6 100644 --- a/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt @@ -116,8 +116,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = City( - results.getString(1), - results.getString(2) + results.getObject(1) as String, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -148,7 +148,7 @@ class QueriesImpl(private val conn: Connection) : Queries { if (!results.next()) { return null } - val ret = results.getInt(1) + val ret = results.getObject(1) as Int if (results.next()) { throw SQLException("expected one row in result set, but got many") } @@ -176,8 +176,8 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = City( - results.getString(1), - results.getString(2) + results.getObject(1) as String, + results.getObject(2) as String ) if (results.next()) { throw SQLException("expected one row in result set, but got many") @@ -197,14 +197,14 @@ class QueriesImpl(private val conn: Connection) : Queries { return null } val ret = Venue( - results.getInt(1), + results.getObject(1) as Int, Status.lookup(results.getString(2))!!, (results.getArray(3).array as Array).map { v -> Status.lookup(v)!! }.toList(), - results.getString(4), - results.getString(5), - results.getString(6), - results.getString(7), - results.getString(8), + results.getObject(4) as String, + results.getObject(5) as String, + results.getObject(6) as String, + results.getObject(7) as String, + results.getObject(8) as String?, (results.getArray(9).array as Array).toList(), results.getObject(10, LocalDateTime::class.java) ) @@ -223,8 +223,8 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(City( - results.getString(1), - results.getString(2) + results.getObject(1) as String, + results.getObject(2) as String )) } ret @@ -240,14 +240,14 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(Venue( - results.getInt(1), + results.getObject(1) as Int, Status.lookup(results.getString(2))!!, (results.getArray(3).array as Array).map { v -> Status.lookup(v)!! }.toList(), - results.getString(4), - results.getString(5), - results.getString(6), - results.getString(7), - results.getString(8), + results.getObject(4) as String, + results.getObject(5) as String, + results.getObject(6) as String, + results.getObject(7) as String, + results.getObject(8) as String?, (results.getArray(9).array as Array).toList(), results.getObject(10, LocalDateTime::class.java) )) @@ -276,7 +276,7 @@ class QueriesImpl(private val conn: Connection) : Queries { if (!results.next()) { return null } - val ret = results.getInt(1) + val ret = results.getObject(1) as Int if (results.next()) { throw SQLException("expected one row in result set, but got many") } @@ -292,8 +292,8 @@ class QueriesImpl(private val conn: Connection) : Queries { val ret = mutableListOf() while (results.next()) { ret.add(VenueCountByCityRow( - results.getString(1), - results.getLong(2) + results.getObject(1) as String, + results.getObject(2) as Long )) } ret