kotlin: remove runtime dependency

The runtime in #368 turned out to
be a bad idea. It's pretty much unnecessary and adds quite a bit to the
complexity of the generated code. It's _possible_ a runtime would be
useful in the future. At that point we can add that back in

Author: mightyguava

examples/kotlin/src/main/kotlin/com/example/authors/Queries.kt

@@ -5,22 +5,18 @@ package com.example.authors
 import java.sql.Connection
 import java.sql.SQLException
 
-import sqlc.runtime.ExecuteQuery
-import sqlc.runtime.ListQuery
-import sqlc.runtime.RowQuery
-
 interface Queries {
   @Throws(SQLException::class)
-  fun createAuthor(name: String, bio: String?): RowQuery<Author>
+  fun createAuthor(name: String, bio: String?): Author
 
   @Throws(SQLException::class)
-  fun deleteAuthor(id: Long): ExecuteQuery
+  fun deleteAuthor(id: Long)
 
   @Throws(SQLException::class)
-  fun getAuthor(id: Long): RowQuery<Author>
+  fun getAuthor(id: Long): Author
 
   @Throws(SQLException::class)
-  fun listAuthors(): ListQuery<Author>
+  fun listAuthors(): List<Author>
 
 }
 

examples/kotlin/src/main/kotlin/com/example/authors/QueriesImpl.kt

@@ -5,10 +5,6 @@ package com.example.authors
 import java.sql.Connection
 import java.sql.SQLException
 
-import sqlc.runtime.ExecuteQuery
-import sqlc.runtime.ListQuery
-import sqlc.runtime.RowQuery
-
 const val createAuthor = """-- name: createAuthor :one
 INSERT INTO authors (
           name, bio
@@ -36,91 +32,71 @@ ORDER BY name
 class QueriesImpl(private val conn: Connection) : Queries {
 
   @Throws(SQLException::class)
-  override fun createAuthor(name: String, bio: String?): RowQuery<Author> {
-    return object : RowQuery<Author>() {
-      override fun execute(): Author {
-        return conn.prepareStatement(createAuthor).use { stmt ->
-          this.statement = stmt
-          stmt.setString(1, name)
+  override fun createAuthor(name: String, bio: String?): Author {
+    return conn.prepareStatement(createAuthor).use { stmt ->
+      stmt.setString(1, name)
           stmt.setString(2, bio)
 
-          val results = stmt.executeQuery()
-          if (!results.next()) {
-            throw SQLException("no rows in result set")
-          }
-          val ret = Author(
+      val results = stmt.executeQuery()
+      if (!results.next()) {
+        throw SQLException("no rows in result set")
+      }
+      val ret = Author(
                 results.getLong(1),
                 results.getString(2),
                 results.getString(3)
             )
-          if (results.next()) {
-              throw SQLException("expected one row in result set, but got many")
-          }
-          ret
-        }
+      if (results.next()) {
+          throw SQLException("expected one row in result set, but got many")
       }
+      ret
     }
   }
 
   @Throws(SQLException::class)
-  override fun deleteAuthor(id: Long): ExecuteQuery {
-    return object : ExecuteQuery() {
-      override fun execute() {
-        conn.prepareStatement(deleteAuthor).use { stmt ->
-          this.statement = stmt
-          stmt.setLong(1, id)
-
-          stmt.execute()
-        }
-      }
+  override fun deleteAuthor(id: Long) {
+    conn.prepareStatement(deleteAuthor).use { stmt ->
+      stmt.setLong(1, id)
+
+      stmt.execute()
     }
   }
 
   @Throws(SQLException::class)
-  override fun getAuthor(id: Long): RowQuery<Author> {
-    return object : RowQuery<Author>() {
-      override fun execute(): Author {
-        return conn.prepareStatement(getAuthor).use { stmt ->
-          this.statement = stmt
-          stmt.setLong(1, id)
-
-          val results = stmt.executeQuery()
-          if (!results.next()) {
-            throw SQLException("no rows in result set")
-          }
-          val ret = Author(
+  override fun getAuthor(id: Long): Author {
+    return conn.prepareStatement(getAuthor).use { stmt ->
+      stmt.setLong(1, id)
+
+      val results = stmt.executeQuery()
+      if (!results.next()) {
+        throw SQLException("no rows in result set")
+      }
+      val ret = Author(
                 results.getLong(1),
                 results.getString(2),
                 results.getString(3)
             )
-          if (results.next()) {
-              throw SQLException("expected one row in result set, but got many")
-          }
-          ret
-        }
+      if (results.next()) {
+          throw SQLException("expected one row in result set, but got many")
       }
+      ret
     }
   }
 
   @Throws(SQLException::class)
-  override fun listAuthors(): ListQuery<Author> {
-    return object : ListQuery<Author>() {
-      override fun execute(): List<Author> {
-        return conn.prepareStatement(listAuthors).use { stmt ->
-          this.statement = stmt
-          
-          val results = stmt.executeQuery()
-          val ret = mutableListOf<Author>()
-          while (results.next()) {
-              ret.add(Author(
+  override fun listAuthors(): List<Author> {
+    return conn.prepareStatement(listAuthors).use { stmt ->
+      
+      val results = stmt.executeQuery()
+      val ret = mutableListOf<Author>()
+      while (results.next()) {
+          ret.add(Author(
                 results.getLong(1),
                 results.getString(2),
                 results.getString(3)
             ))
-          }
-          ret
-        }
       }
+      ret
     }
   }
 

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

@@ -7,19 +7,15 @@ import java.sql.SQLException
 import java.sql.Types
 import java.time.OffsetDateTime
 
-import sqlc.runtime.ExecuteQuery
-import sqlc.runtime.ListQuery
-import sqlc.runtime.RowQuery
-
 interface Queries {
   @Throws(SQLException::class)
-  fun booksByTags(dollar1: List<String>): ListQuery<BooksByTagsRow>
+  fun booksByTags(dollar1: List<String>): List<BooksByTagsRow>
 
   @Throws(SQLException::class)
-  fun booksByTitleYear(title: String, year: Int): ListQuery<Book>
+  fun booksByTitleYear(title: String, year: Int): List<Book>
 
   @Throws(SQLException::class)
-  fun createAuthor(name: String): RowQuery<Author>
+  fun createAuthor(name: String): Author
 
   @Throws(SQLException::class)
   fun createBook(
@@ -29,29 +25,29 @@ interface Queries {
       title: String,
       year: Int,
       available: OffsetDateTime,
-      tags: List<String>): RowQuery<Book>
+      tags: List<String>): Book
 
   @Throws(SQLException::class)
-  fun deleteBook(bookId: Int): ExecuteQuery
+  fun deleteBook(bookId: Int)
 
   @Throws(SQLException::class)
-  fun getAuthor(authorId: Int): RowQuery<Author>
+  fun getAuthor(authorId: Int): Author
 
   @Throws(SQLException::class)
-  fun getBook(bookId: Int): RowQuery<Book>
+  fun getBook(bookId: Int): Book
 
   @Throws(SQLException::class)
   fun updateBook(
       title: String,
       tags: List<String>,
-      bookId: Int): ExecuteQuery
+      bookId: Int)
 
   @Throws(SQLException::class)
   fun updateBookISBN(
       title: String,
       tags: List<String>,
       isbn: String,
-      bookId: Int): ExecuteQuery
+      bookId: Int)
 
 }