#89

croc-code · Jan 15, 2019 · 0cf5ddb · 0cf5ddb
1 parent 015e524
commit 0cf5ddb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 80 deletions.
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/impl/sql/SqlResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/impl/sql/SqlResourceType.kt
@@ -53,7 +53,7 @@ class SqlResourceType(
     }
 
     override fun read(uri: Uri): Sequence<DbResource> {
-        return selectQuery.select(hashMapOf("uri" to uri))
+        return selectQuery.execute(hashMapOf("uri" to uri))
                 .map { o ->
                     val path = o.entries
                             .filter { v -> v.key.startsWith("@") }

diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SqlController.kt b/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SqlController.kt
@@ -41,27 +41,27 @@ class SqlController(@field:Autowired private val dataSource: DataSource) {
 
     @RequestMapping(value = ["sql"], produces = arrayOf(MediaType.APPLICATION_XML_VALUE))
     fun execSql2Xml(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().toList()
+        return JdbcSelectQuery(dataSource, sql).execute(hashMapOf()).toList()
     }
 
     @RequestMapping(
             value = ["exec"],
             method = arrayOf(RequestMethod.POST),
             produces = arrayOf(MediaType.APPLICATION_XML_VALUE))
     fun execSql2XmlPost(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().toList()
+        return JdbcSelectQuery(dataSource, sql).execute(hashMapOf()).toList()
     }
 
     @RequestMapping(value = ["exec"], produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
     fun execSql2Json(@RequestParam("sql") sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().toList()
+        return JdbcSelectQuery(dataSource, sql).execute(hashMapOf()).toList()
     }
 
     @RequestMapping(
             value = ["exec"],
             method = arrayOf(RequestMethod.POST),
             produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
     fun execSql2JsonPost(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().toList()
+        return JdbcSelectQuery(dataSource, sql).execute(hashMapOf()).toList()
     }
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/SelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/SelectQuery.kt
@@ -33,22 +33,12 @@ package com.github.mgramin.sqlboot.sql.select
  */
 interface SelectQuery {
 
-    /**
-     * Execute select query
-     *
-     * @return query result
-     */
-    @Deprecated("")
-    fun select(): Sequence<Map<String, Any>>
-
     /**
      * Execute select query with parameters
      *
      * @return query result
      */
-    fun select(variables: Map<String, Any>): Sequence<Map<String, Any>> {
-        return select()
-    }
+    fun execute(variables: Map<String, Any>): Sequence<Map<String, Any>>
 
     /**
      *

diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/impl/JdbcSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/impl/JdbcSelectQuery.kt
@@ -54,15 +54,15 @@ class JdbcSelectQuery(
     constructor(dataSource: DataSource, sql: String)
             : this(dataSource, sql, "[NULL]", null)
 
-    override fun select(): Sequence<Map<String, Any>> {
-        return getMapStream(sql)
-    }
-
-    override fun select(variables: Map<String, Any>): Sequence<Map<String, Any>> {
-        return getMapStream(templateGenerator!!.generate(variables))
+    override fun execute(variables: Map<String, Any>): Sequence<Map<String, Any>> {
+        return if (sql != null) {
+            getMapStream(sql)
+        } else {
+            getMapStream(templateGenerator!!.generate(variables))
+        }
     }
 
-    private fun getMapStream(sqlText: String?): Sequence<Map<String, Any>> {
+    private fun getMapStream(sqlText: String): Sequence<Map<String, Any>> {
         logger.info(sqlText)
         val rowSet = JdbcTemplate(dataSource).queryForRowSet(sqlText)
         val iterator = object : Iterator<Map<String, Any>> {

diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PageWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PageWrapper.kt
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/sql/impl/JdbcSelectQueryTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/sql/impl/JdbcSelectQueryTest.kt
@@ -50,10 +50,10 @@ class JdbcSelectQueryTest {
     fun select() {
         val select = JdbcSelectQuery(this.dataSource!!,
                 """select *
-                  |  from (select name as   "n"
+                  |  from (select name  as   "n"
                   |             , email as "mail"
                   |          from main_schema.users)""".trimMargin())
-                .select().toList()
+                .execute(hashMapOf()).toList()
         assertEquals(select.toString(),
                 "[{n=mkyong, [email protected]}, {n=alex, [email protected]}, {n=joel, [email protected]}]")
     }
@@ -65,7 +65,6 @@ class JdbcSelectQueryTest {
                                           |     , email as email    /* email */
                                           |  from main_schema.users""".trimMargin()))
         val metadata = selectQuery.columns()
-        println(metadata)
         assertEquals("email", metadata["email"])
         assertEquals("name", metadata["name"])
     }