#321 fix pagination

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt

@@ -62,6 +62,10 @@ open class SimpleEndpoint(
             dataSourceNew.url = properties()["jdbc.url"].toString()
             dataSourceNew.username = properties()["jdbc.user"].toString()
             dataSourceNew.password = properties()["jdbc.password"].toString()
+            dataSourceNew.minIdle = 1
+            dataSourceNew.maxActive = 3
+            dataSourceNew.maxIdle = 3
+            dataSourceNew.maxWait = 3
             dataSource = dataSourceNew
             dataSourceNew
         }

src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/ApiController.kt

@@ -123,15 +123,27 @@ class ApiController {
     @RequestMapping(value = ["/api/{connection}/{type}"], method = [GET, POST])
     fun getResourcesHeadersJson(@PathVariable connection: String,
                                 @PathVariable type: String,
-                                request: HttpServletRequest) =
-            getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri("$connection/$type")))
+                                request: HttpServletRequest): ResponseEntity<List<Map<String, Any>>> {
+        val uriString = if (request.queryString != null) {
+            "$connection/$type?${request.queryString}"
+        } else {
+            "$connection/$type"
+        }
+        return getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri(uriString)))
+    }
 
     @RequestMapping(value = ["/api/{connection}/{type}/{path}"], method = [GET, POST])
     fun getResourcesHeadersJson(@PathVariable connection: String,
                                 @PathVariable type: String,
                                 @PathVariable path: String,
-                                request: HttpServletRequest) =
-            getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri("$connection/$type/$path")))
+                                request: HttpServletRequest): ResponseEntity<List<Map<String, Any>>> {
+        val uriString = if (request.queryString != null) {
+            "$connection/$type/$path?${request.queryString}"
+        } else {
+            "$connection/$type/$path"
+        }
+        return getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri(uriString)))
+    }
 
     private fun getListResponseEntityHeaders(uri: Uri): ResponseEntity<List<Map<String, Any>>> {
         val connections = endpointList.getByMask(uri.connection())

src/main/resources/application.yml

@@ -37,7 +37,6 @@ conf:
           "jdbc.user": "postgres",
           "jdbc.password": "postgres",
           "os.query.rest.port": "8082",
-          "visible": false,
           "description": "Embedded db for unit tests only"
         }
 

src/test/kotlin/com/github/mgramin/sqlboot/template/generator/impl/GroovyTemplateGeneratorTest.kt

@@ -54,4 +54,11 @@ class GroovyTemplateGeneratorTest {
         assertEquals(templateGenerator.generate(maps), "create table persons ...")
     }
 
+    @Test
+    fun test() {
+        val maps = hashMapOf("column" to "id", "table" to "persons", "__timeFilter" to "public")
+        val templateGenerator = GroovyTemplateGenerator("create table \${table.toLowerCase()} ... where \$__timeFilter(time)")
+        assertEquals(templateGenerator.generate(maps), "create table persons ...")
+    }
+
 }