#292

Author: mgramin

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

@@ -25,7 +25,6 @@
 package com.github.mgramin.sqlboot.model.connection
 
 class CheckedConnection(private val origin: DbConnection) : DbConnection {
-
     private val health: String
 
     init {
@@ -39,6 +38,8 @@ class CheckedConnection(private val origin: DbConnection) : DbConnection {
 
     override fun name() = origin.name()
 
+    override fun dialect() = origin.dialect()
+
     override fun properties() = origin.properties()
 
     override fun health() = health

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

@@ -32,6 +32,8 @@ interface DbConnection {
 
     fun health(): String
 
+    fun dialect(): String
+
     fun getDataSource(): DataSource
 
     fun paginationQueryTemplate(): String

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

@@ -28,6 +28,8 @@ import javax.sql.DataSource
 
 class FakeDbConnection : DbConnection {
 
+    override fun dialect() = "h2"
+
     override fun properties(): Map<String, Any> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }

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

@@ -42,9 +42,12 @@ open class SimpleDbConnection(
         @JsonIgnore var password: String? = null,
         var driverClassName: String? = null,
         var properties: String? = null,
-        var paginationQueryTemplate: String? = null
+        var paginationQueryTemplate: String? = null,
+        var dialect: String? = null
 ) : DbConnection {
 
+    override fun dialect() = this.dialect!!
+
     override fun name() = this.name!!
 
     override fun paginationQueryTemplate() = this.paginationQueryTemplate!!

src/main/kotlin/com/github/mgramin/sqlboot/model/dialect/DbDialectList.kt

@@ -33,6 +33,6 @@ import org.springframework.stereotype.Service
 @ConfigurationProperties(prefix = "conf")
 open class DbDialectList(val dialects: List<DbDialect>) {
 
-    fun dialect(name: String) = dialects.first()
+    fun dialect(name: String) = dialects.first { it.name.equals(name, ignoreCase = true) }
 
 }

src/main/kotlin/com/github/mgramin/sqlboot/model/dialect/FakeDialect.kt

@@ -0,0 +1,34 @@
+/*
+ * The MIT License (MIT)
+ * <p>
+ * Copyright (c) 2016-2019 Maksim Gramin
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.mgramin.sqlboot.model.dialect
+
+// TODO rename to H2Dialect
+class FakeDialect : Dialect {
+
+    override fun name() = "h2"
+
+    override fun paginationQueryTemplate() = "${"$"}{query}"
+
+}

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt

@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl
 
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.connection.SimpleDbConnection
+import com.github.mgramin.sqlboot.model.dialect.Dialect
 import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.resourcetype.wrappers.body.BodyWrapper
@@ -43,7 +44,10 @@ import java.nio.charset.StandardCharsets.UTF_8
 /**
  * Created by MGramin on 11.07.2017.
  */
-class FsResourceType(private val dbConnections: List<SimpleDbConnection>) : ResourceType {
+class FsResourceType(
+        private val dbConnections: List<SimpleDbConnection>,
+        private val dialects: List<Dialect>
+) : ResourceType {
 
     private val resourceTypes: List<ResourceType> = walk(dbConnections.first().baseFolder!!.file.path)
 
@@ -64,7 +68,8 @@ class FsResourceType(private val dbConnections: List<SimpleDbConnection>) : Reso
                                     SqlResourceType(
                                             aliases = listOf(File(it.name()).nameWithoutExtension),
                                             sql = it.content().toString(Charset.defaultCharset()),
-                                            connections = dbConnections),
+                                            connections = dbConnections,
+                                            dialects = dialects),
                                     templateGenerator = GroovyTemplateGenerator("[EMPTY BODY]"))))
 
     @Deprecated("")
@@ -80,7 +85,6 @@ class FsResourceType(private val dbConnections: List<SimpleDbConnection>) : Reso
                             .filter { it.name().matches(wildcardToRegex(uri)) }
                             .map { it.read(uri) })
 
-
     override fun metaData(uri: Uri): List<Metadata> =
             resourceTypes
                     .filter { it.name().matches(wildcardToRegex(uri)) }

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt

@@ -25,6 +25,7 @@
 package com.github.mgramin.sqlboot.model.resourcetype.impl
 
 import com.github.mgramin.sqlboot.model.connection.DbConnection
+import com.github.mgramin.sqlboot.model.dialect.Dialect
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.resource.impl.DbResourceImpl
 import com.github.mgramin.sqlboot.model.resourcetype.Metadata
@@ -46,7 +47,8 @@ import reactor.core.publisher.Flux
 class SqlResourceType(
         private val aliases: List<String>,
         sql: String,
-        private val connections: List<DbConnection>
+        private val connections: List<DbConnection>,
+        private val dialects: List<Dialect>
 ) : ResourceType {
 
     private val simpleSelectQuery = SimpleSelectQuery(GroovyTemplateGenerator(sql))
@@ -97,7 +99,9 @@ class SqlResourceType(
                                 simpleSelectQuery,
                                 uri.orderedColumns()),
                         uri,
-                        connection.paginationQueryTemplate()),
+                        //dialects.first { it.name.equals("h2") }.paginationQueryTemplate!!
+                        dialects.first { it.name() == connection.dialect() }.paginationQueryTemplate()
+                ),
                 dataSource = connection.getDataSource())
     }
 

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

@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.rest.controllers
 
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.connection.DbConnectionList
+import com.github.mgramin.sqlboot.model.dialect.DbDialectList
 import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.resourcetype.impl.FsResourceType
@@ -60,10 +61,13 @@ class ApiController {
     @Autowired
     private lateinit var dbConnectionList: DbConnectionList
 
+    @Autowired
+    private lateinit var dbDialectList: DbDialectList
+
 
     @RequestMapping(value = ["/api/{connectionName}/types"])
     fun types(@PathVariable connectionName: String): List<ResourceType>? {
-        return FsResourceType(dbConnectionList.getConnectionsByMask(connectionName)).resourceTypes()
+        return FsResourceType(dbConnectionList.getConnectionsByMask(connectionName), emptyList()).resourceTypes()
     }
 
 
@@ -88,7 +92,7 @@ class ApiController {
     private fun getListResponseEntityHeaders(uri: Uri): ResponseEntity<List<Map<String, Any>>> {
         val connections = dbConnectionList.getConnectionsByMask(uri.connection())
         try {
-            val headers = FsResourceType(connections)
+            val headers = FsResourceType(connections, dbDialectList.dialects)
                     .read(uri)
                     .map { it.headers() }
                     .collectList()
@@ -109,7 +113,8 @@ class ApiController {
 
     private fun responseEntity(uri: Uri): ResponseEntity<List<Metadata>> {
         val fsResourceTypes = FsResourceType(
-                listOf(dbConnectionList.getConnectionByName(uri.connection())))
+                listOf(dbConnectionList.getConnectionByName(uri.connection())),
+                emptyList())
         val resourceType = fsResourceTypes
                 .resourceTypes()
                 .stream()

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

@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.rest.controllers
 
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.github.mgramin.sqlboot.model.connection.DbConnectionList
+import com.github.mgramin.sqlboot.model.dialect.DbDialectList
 import com.github.mgramin.sqlboot.model.resourcetype.impl.FsResourceType
 import io.swagger.models.Info
 import io.swagger.models.ModelImpl
@@ -92,7 +93,7 @@ class SwaggerController {
 
     private fun getSwaggerDescription(request: HttpServletRequest, connectionName: String): Swagger {
         val fsResourceTypes = FsResourceType(
-                listOf(dbConnectionList.getConnectionByName(connectionName)))
+                listOf(dbConnectionList.getConnectionByName(connectionName)), emptyList())
         val resourceTypes = fsResourceTypes.resourceTypes()
         val swagger = Swagger()