fix #233

mgramin · mgramin · commit 1fe162ab32da · 2019-07-09T15:02:55.000+03:00
diff --git a/conf/h2/md/database/schema/table.md b/conf/h2/md/database/schema/table.md
@@ -15,8 +15,8 @@ select "@schema"            /* { "label": "Owner", "description": "Owner of the
              , t.table_name   as "@table"
              , t.*
           from information_schema.tables t
-         where lower(t.table_schema) like lower('${uri.path(0)}')
-           and lower(t.table_name) like lower('${uri.path(1)}'))
+         where lower(t.table_schema) like lower('{{ uri.path(0) }}')
+           and lower(t.table_name) like lower('{{ uri.path(1) }}'))
 ````
 
 ````sql
diff --git a/pom.xml b/pom.xml
@@ -178,23 +178,10 @@
             <scope>test</scope>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>3.0.0-beta-1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-xml</artifactId>
-            <version>3.0.0-beta-1</version>
-        </dependency>
-
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-templates</artifactId>
-            <version>3.0.0-beta-1</version>
+            <groupId>com.hubspot.jinjava</groupId>
+            <artifactId>jinjava</artifactId>
+            <version>2.5.1</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/dialect/FakeDialect.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/dialect/FakeDialect.kt
@@ -37,6 +37,6 @@ class FakeDialect : Dialect {
 
     override fun name() = "h2"
 
-    override fun paginationQueryTemplate() = "${"$"}{query}"
+    override fun paginationQueryTemplate() = "{{ query }}"
 
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt
@@ -42,7 +42,7 @@ import com.github.mgramin.sqlboot.model.resourcetype.wrappers.header.SelectWrapp
 import com.github.mgramin.sqlboot.model.resourcetype.wrappers.header.TypeWrapper
 import com.github.mgramin.sqlboot.model.resourcetype.wrappers.list.SortWrapper
 import com.github.mgramin.sqlboot.model.uri.Uri
-import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.github.mgramin.sqlboot.template.generator.impl.FakeTemplateGenerator
 import com.github.mgramin.sqlboot.tools.files.file.impl.MarkdownFile
 import org.springframework.core.io.FileSystemResource
 import reactor.core.publisher.Flux
@@ -100,7 +100,7 @@ class FsResourceType(
                                                     sql = it,
                                                     endpoints = endpoints,
                                                     dialects = dialects),
-                                            templateGenerator = GroovyTemplateGenerator("[EMPTY BODY]")))))
+                                            templateGenerator = FakeTemplateGenerator("[EMPTY BODY]")))))
 
     private fun wildcardToRegex(uri: Uri) =
             uri.type().replace("?", ".?").replace("*", ".*?").toRegex()
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt
@@ -43,8 +43,12 @@ import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.model.uri.impl.FakeUri
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
 import com.github.mgramin.sqlboot.sql.select.impl.SimpleSelectQuery
-import com.github.mgramin.sqlboot.sql.select.wrappers.*
-import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.github.mgramin.sqlboot.sql.select.wrappers.GrafanaSelectQuery
+import com.github.mgramin.sqlboot.sql.select.wrappers.JdbcSelectQuery
+import com.github.mgramin.sqlboot.sql.select.wrappers.OrderedSelectQuery
+import com.github.mgramin.sqlboot.sql.select.wrappers.PaginatedSelectQuery
+import com.github.mgramin.sqlboot.sql.select.wrappers.RestSelectQuery
+import com.github.mgramin.sqlboot.template.generator.impl.JinjaTemplateGenerator
 import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
@@ -60,7 +64,7 @@ class SqlResourceType(
         private val dialects: List<Dialect>
 ) : ResourceType {
 
-    private val simpleSelectQuery = SimpleSelectQuery(GroovyTemplateGenerator(sql))
+    private val simpleSelectQuery = SimpleSelectQuery(JinjaTemplateGenerator(sql))
 
     override fun aliases(): List<String> {
         return listOf(simpleSelectQuery.properties()["name"]!!)
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/JdbcSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/JdbcSelectQuery.kt
@@ -33,7 +33,7 @@
 package com.github.mgramin.sqlboot.sql.select.wrappers
 
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
-import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.github.mgramin.sqlboot.template.generator.impl.JinjaTemplateGenerator
 import org.slf4j.LoggerFactory
 import org.springframework.jdbc.core.JdbcTemplate
 import reactor.core.publisher.Flux
@@ -66,7 +66,7 @@ class JdbcSelectQuery(
     override fun columns() = origin.columns()
 
     override fun execute(variables: Map<String, Any>): Flux<Map<String, Any>> {
-        val sqlText = GroovyTemplateGenerator(origin.query()).generate(variables)
+        val sqlText = JinjaTemplateGenerator(origin.query()).generate(variables)
         logger.info(sqlText)
 
         return Mono.fromCallable {
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PaginatedSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PaginatedSelectQuery.kt
@@ -34,7 +34,7 @@ package com.github.mgramin.sqlboot.sql.select.wrappers
 
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
-import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.github.mgramin.sqlboot.template.generator.impl.JinjaTemplateGenerator
 
 class PaginatedSelectQuery(
         private val origin: SelectQuery,
@@ -51,7 +51,7 @@ class PaginatedSelectQuery(
                     "uri" to uri,
                     "offset" to uri.pageSize() * (uri.pageNumber() - 1),
                     "limit" to uri.pageSize())
-            GroovyTemplateGenerator(template).generate(vars)
+            JinjaTemplateGenerator(template).generate(vars)
         } else {
             origin.query()
         }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/TemplatedSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/TemplatedSelectQuery.kt
@@ -33,7 +33,7 @@
 package com.github.mgramin.sqlboot.sql.select.wrappers
 
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
-import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.github.mgramin.sqlboot.template.generator.impl.JinjaTemplateGenerator
 
 class TemplatedSelectQuery(
         private val origin: SelectQuery,
@@ -46,7 +46,7 @@ class TemplatedSelectQuery(
     override fun query(): String {
         val vars = hashMapOf<String, Any>("query" to origin.query())
         vars.putAll(variables)
-        return GroovyTemplateGenerator(template).generate(vars)
+        return JinjaTemplateGenerator(template).generate(vars)
     }
 
     override fun columns() = origin.columns()
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/template/generator/impl/JinjaTemplateGenerator.kt b/src/main/kotlin/com/github/mgramin/sqlboot/template/generator/impl/JinjaTemplateGenerator.kt
@@ -33,18 +33,17 @@
 package com.github.mgramin.sqlboot.template.generator.impl
 
 import com.github.mgramin.sqlboot.template.generator.TemplateGenerator
-import groovy.text.GStringTemplateEngine
-import groovy.text.Template
+import com.hubspot.jinjava.Jinjava
 
-class GroovyTemplateGenerator(private val templateText: String) : TemplateGenerator {
 
-    private val template: Template = GStringTemplateEngine().createTemplate(templateText)
+class JinjaTemplateGenerator(private val templateText: String) : TemplateGenerator {
 
     override fun generate(variables: Map<String, Any>): String {
-        return this.template.make(variables).toString()
+        return Jinjava().render(templateText, variables)
     }
 
     override fun template(): String {
         return templateText
     }
-}
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,13 +3,13 @@ conf:
   dialects:
     - name: h2
       paginationQueryTemplate: >
-        ${query} offset ${uri.pageSize()*(uri.pageNumber()-1)} limit ${uri.pageSize()}
+        {{ query }} offset {{ uri.pageSize()*(uri.pageNumber()-1) }} limit {{ uri.pageSize() }}
     - name: postgres
       paginationQueryTemplate: >
-        ${query} offset ${uri.pageSize()*(uri.pageNumber()-1)} limit ${uri.pageSize()}
+        {{ query }} offset {{ uri.pageSize()*(uri.pageNumber()-1) }} limit {{ uri.pageSize() }}
     - name: osquery
       paginationQueryTemplate: >
-        ${query} limit ${uri.pageSize()*(uri.pageNumber()-1)}, ${uri.pageSize()}
+        {{ query }} limit {{ uri.pageSize()*(uri.pageNumber()-1) }}, {{ uri.pageSize() }}
 
   endpoints:
     - name: h2
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PaginatedSelectQueryTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PaginatedSelectQueryTest.kt
@@ -56,7 +56,7 @@ internal class PaginatedSelectQueryTest {
                 PaginatedSelectQuery(
                         origin = FakeSelectQuery(),
                         uri = DbUri("table/hr.persons?page=$pageNumber,$pageSize"),
-                        template = "${"$"}{query} offset ${"$"}offset limit ${"$"}limit")
+                        template = "{{ query }} offset {{ offset }} limit {{ limit }}")
         println(paginatedSelectQuery.query())
         assertTrue(paginatedSelectQuery.query().contains(expectedQuery))
     }
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/template/generator/impl/JinjaTemplateGeneratorTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/template/generator/impl/JinjaTemplateGeneratorTest.kt
@@ -32,34 +32,16 @@
 
 package com.github.mgramin.sqlboot.template.generator.impl
 
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
 
-/**
- * Created by MGramin on 10.12.2016.
- */
-class GroovyTemplateGeneratorTest {
+internal class JinjaTemplateGeneratorTest {
 
     @Test
-    fun process() {
-        val txt = """... where lower(c.table_schema) like '${'$'}schema'
-                    |      and lower(c.table_name) like '${'$'}table'
-                    |      and lower(c.column_name) like '${'$'}column'""".trimMargin()
-
-        val result = """... where lower(c.table_schema) like 'public'
-                       |      and lower(c.table_name) like 'persons'
-                       |      and lower(c.column_name) like 'id'""".trimMargin()
-
-        val maps = hashMapOf("column" to "id", "table" to "persons", "schema" to "public")
-        val templateGenerator = GroovyTemplateGenerator(txt)
-        assertEquals(templateGenerator.generate(maps), result)
-    }
+    fun generate() =
+            assertEquals("Hello, World!", JinjaTemplateGenerator("Hello, {{ name }}!").generate(mapOf("name" to "World")))
 
     @Test
-    fun processLoweCase() {
-        val maps = hashMapOf("column" to "id", "table" to "persons", "schema" to "public")
-        val templateGenerator = GroovyTemplateGenerator("create table \${table.toLowerCase()} ...")
-        assertEquals(templateGenerator.generate(maps), "create table persons ...")
-    }
+    fun template() = assertEquals("Hello, {{ name }}!", JinjaTemplateGenerator("Hello, {{ name }}!").template())
 
 }
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -3,7 +3,7 @@ conf:
   dialects:
     - name: h2
       paginationQueryTemplate: >
-        ${query} offset ${uri.pageSize()*(uri.pageNumber()-1)} limit ${uri.pageSize()}
+        {{ query }} offset {{ uri.pageSize()*(uri.pageNumber()-1) }} limit {{ uri.pageSize() }}
 
   endpoints:
     - name: h2

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ class FakeDialect : Dialect {`
`37`	`37`
`38`	`38`	`override fun name() = "h2"`
`39`	`39`
`40`		`- override fun paginationQueryTemplate() = "${"$"}{query}"`
	`40`	`+ override fun paginationQueryTemplate() = "{{ query }}"`
`41`	`41`
`42`	`42`	`}`