fix #337

Author: mgramin

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

@@ -43,10 +43,7 @@ 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.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.sql.select.wrappers.*
 import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
 import com.google.gson.Gson
 import com.google.gson.JsonArray
@@ -127,12 +124,13 @@ class SqlResourceType(
     private fun createQuery(uri: Uri, endpoint: Endpoint, dialect: String): SelectQuery {
         val paginationQueryTemplate = dialects.first { it.name() == dialect }.paginationQueryTemplate()
         val baseQuery =
-                PaginatedSelectQuery(
-                        OrderedSelectQuery(
-                                simpleSelectQuery,
-                                uri.orderedColumns()),
-                        uri,
-                        paginationQueryTemplate)
+                GrafanaSelectQuery(
+                        PaginatedSelectQuery(
+                                OrderedSelectQuery(
+                                        simpleSelectQuery,
+                                        uri.orderedColumns()),
+                                uri,
+                                paginationQueryTemplate))
         return if (simpleSelectQuery.properties()["executor"] == "http") {
             RestSelectQuery(
                     baseQuery,

src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/GrafanaSelectQuery.kt

@@ -0,0 +1,17 @@
+package com.github.mgramin.sqlboot.sql.select.wrappers
+
+import com.github.mgramin.sqlboot.sql.select.SelectQuery
+
+class GrafanaSelectQuery(
+        private val origin: SelectQuery
+) : SelectQuery {
+
+    override fun query() = origin.query().replace("${"$"}__timeFilter(time)", "1=1")
+
+    override fun execute(variables: Map<String, Any>) = origin.execute(variables)
+
+    override fun properties() = origin.properties()
+
+    override fun columns() = origin.columns()
+
+}

src/test/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/GrafanaSelectQueryTest.kt

@@ -0,0 +1,13 @@
+package com.github.mgramin.sqlboot.sql.select.wrappers
+
+import org.junit.jupiter.api.Test
+
+import org.junit.jupiter.api.Assertions.*
+
+internal class GrafanaSelectQueryTest {
+
+    @Test
+    fun query() {
+    }
+
+}