#391

Author: mgramin

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

@@ -43,6 +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.CustomFilteredSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.FilteredSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.GrafanaSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.JdbcSelectQuery
@@ -131,8 +132,10 @@ class SqlResourceType(
                 GrafanaSelectQuery(
                         PaginatedSelectQuery(
                                 OrderedSelectQuery(
-                                        FilteredSelectQuery(
-                                                simpleSelectQuery, uri.path()),
+                                        CustomFilteredSelectQuery(
+                                                FilteredSelectQuery(
+                                                        simpleSelectQuery, uri.path()),
+                                                uri.filter()),
                                         uri.orderedColumns()),
                                 uri,
                                 paginationQueryTemplate)),

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/WhereWrapper.kt

@@ -56,7 +56,7 @@ class WhereWrapper(private val origin: ResourceType) : ResourceType {
         val resources = origin.read(uri)
         return resources
                 .filter { resource ->
-                    for (i in 0 until uri.path().size) {
+                    for (i in uri.path().indices) {
                         val contains = resource.dbUri().path()[i]
                                 .toLowerCase().contains(uri.path()[i]
                                         .toLowerCase()) || uri.path()[i] == "%"

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/Uri.kt

@@ -33,6 +33,8 @@
 package com.github.mgramin.sqlboot.model.uri
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import org.apache.commons.lang3.StringUtils
 import java.io.Serializable
 
@@ -124,4 +126,12 @@ interface Uri : Serializable {
                 .toMap()
     }
 
+    fun filter(): JsonObject {
+        return if (params().containsKey("filter")) {
+            JsonParser().parse(params()["filter"]).asJsonObject
+        } else {
+            JsonObject()
+        }
+    }
+
 }

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/impl/DbUri.kt

@@ -58,9 +58,7 @@ class DbUri : Uri {
 
     constructor(uriString: String) {
         try {
-            val str = uriString.replace("|", "%7C")
-            val uri = URI(str)
-
+            val uri = URI(uriString.replace("|", "%7C").replace("{", "%7B").replace("}", "%7D").replace(":", "%3A").replace(""""""", "%22"))
             val pathMap: Map<Int, String> = uri.path
                     .split("/")
                     .filter { it.isNotEmpty() }

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

@@ -0,0 +1,61 @@
+/*
+ * BSD 3-Clause License
+ *
+ * Copyright (c) 2019, CROC Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.github.mgramin.sqlboot.sql.select.wrappers
+
+import com.github.mgramin.sqlboot.sql.select.SelectQuery
+import com.google.gson.JsonObject
+
+
+class CustomFilteredSelectQuery(
+        private val origin: SelectQuery,
+        private val filter: JsonObject
+) : SelectQuery {
+
+    override fun query(): String {
+        return if (filter.entrySet().size > 0) {
+            val whereCondition = filter.entrySet()
+                    .joinToString(prefix = "where ", separator = " and ") { """${it.key} = '${it.value.asString}'""" }
+            """select *
+                 |  from (${origin.query()}) q
+                 | $whereCondition""".trimMargin()
+        } else {
+            origin.query()
+        }
+    }
+
+    override fun properties() = origin.properties()
+
+    override fun columns() = origin.columns()
+
+    override fun execute(variables: Map<String, Any>) = origin.execute(variables)
+}

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

@@ -42,6 +42,7 @@ class FilteredSelectQuery(
     override fun properties() = origin.properties()
 
     override fun query(): String {
+        println("!!!!!!!!!!!!!!!!")
         return if (path.isEmpty()) {
             origin.query()
         } else {
@@ -51,8 +52,8 @@ class FilteredSelectQuery(
                     .mapIndexed { index, s -> """lower(${s.key}) like lower('${path[index]}')""" }
                     .joinToString(prefix = "where ", separator = " and ")
             """select *
-                 |  from (${origin.query()}) q
-                 | $whereCondition""".trimMargin()
+              |  from (${origin.query()}) q
+              | $whereCondition""".trimMargin()
         }
     }
 

src/main/malewicz/src/components/ConnectionsListPanel.vue

@@ -17,10 +17,10 @@
 </template>
 
 <script>
-  export default {
-    name: 'ConnectionsListPanel',
-    data() {
-      return {}
-    }
+export default {
+  name: 'ConnectionsListPanel',
+  data () {
+    return {}
   }
+}
 </script>

src/main/malewicz/src/components/CustomComponent.vue

@@ -48,57 +48,57 @@
   </div>
 </template>
 <script>
-  import moment from 'moment'
+import moment from 'moment'
 
-  export default {
-    name: 'CustomComponent',
-    props: {
-      met: {},
-      props: {}
+export default {
+  name: 'CustomComponent',
+  props: {
+    met: {},
+    props: {}
+  },
+  filters: {
+    formatDate: function (value) {
+      if (value) {
+        return moment(String(value)).format('DD.MM.YYYY HH:mm:ss')
+      }
+    },
+    round: function (value, decimals) {
+      if (typeof value !== 'number') {
+        return value
+      }
+      if (!value) {
+        value = 0
+      }
+      if (!decimals) {
+        decimals = 0
+      }
+      value = Math.round(value * Math.pow(10, decimals)) / Math.pow(10, decimals)
+      return value
     },
-    filters: {
-      formatDate: function (value) {
-        if (value) {
-          return moment(String(value)).format('DD.MM.YYYY HH:mm:ss')
-        }
-      },
-      round: function (value, decimals) {
-        if(typeof value !== 'number'){
-          return value
-        }
-        if(!value) {
-          value = 0;
-        }
-        if (!decimals) {
-          decimals = 0;
-        }
-        value = Math.round(value * Math.pow(10, decimals)) / Math.pow(10, decimals)
-        return value;
-      },
-      prettyByte: function (num) {
-        if (typeof num !== 'number' || isNaN(num)) {
-          throw new TypeError('Expected a number');
-        }
+    prettyByte: function (num) {
+      if (typeof num !== 'number' || isNaN(num)) {
+        throw new TypeError('Expected a number')
+      }
 
-        var exponent;
-        var unit;
-        var neg = num < 0;
-        var units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+      var exponent
+      var unit
+      var neg = num < 0
+      var units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
 
-        if (neg) {
-          num = -num;
-        }
+      if (neg) {
+        num = -num
+      }
 
-        if (num < 1) {
-          return (neg ? '-' : '') + num + ' B';
-        }
+      if (num < 1) {
+        return (neg ? '-' : '') + num + ' B'
+      }
 
-        exponent = Math.min(Math.floor(Math.log(num) / Math.log(1000)), units.length - 1);
-        num = (num / Math.pow(1000, exponent)).toFixed(2) * 1;
-        unit = units[exponent];
+      exponent = Math.min(Math.floor(Math.log(num) / Math.log(1000)), units.length - 1)
+      num = (num / Math.pow(1000, exponent)).toFixed(2) * 1
+      unit = units[exponent]
 
-        return (neg ? '-' : '') + num + ' ' + unit;
-      }
+      return (neg ? '-' : '') + num + ' ' + unit
     }
   }
+}
 </script>

src/main/malewicz/src/components/HelloWorld.vue

@@ -26,37 +26,37 @@
 
 <script>
 
-  import TypesListPanel from './TypesListPanel'
-  import ConnectionsListPanel from './ConnectionsListPanel'
-  import ObjectsTablePanel from './ObjectsTablePanel'
+import TypesListPanel from './TypesListPanel'
+import ConnectionsListPanel from './ConnectionsListPanel'
+import ObjectsTablePanel from './ObjectsTablePanel'
 
-  export default {
-   data: () => ({
+export default {
+  data: () => ({
     drawer: true,
     drawerRight: true,
     right: null,
     left: null
   }),
 
-    props: ['panel'],
-    name: 'HelloWorld',
-    components: {ObjectsTablePanel, ConnectionsListPanel, TypesListPanel},
-    watch: {
-      $route(to, from) {
-        this.$store.commit('changeUri', to.fullPath)
-      },
-      getSimpleUri: function (newUri, oldUri) {
-        this.$router.push({path: '/' + newUri})
-      }
+  props: ['panel'],
+  name: 'HelloWorld',
+  components: {ObjectsTablePanel, ConnectionsListPanel, TypesListPanel},
+  watch: {
+    $route (to, from) {
+      this.$store.commit('changeUri', to.fullPath)
     },
-    computed: {
-      getSimpleUri() {
-        return this.$store.getters.getSimpleUri
-      }
-    },
-    created: function () {
-        this.$store.commit('changeUri', this.$router.currentRoute.fullPath)
+    getSimpleUri: function (newUri, oldUri) {
+      this.$router.push({path: '/' + newUri})
+    }
+  },
+  computed: {
+    getSimpleUri () {
+      return this.$store.getters.getSimpleUri
     }
+  },
+  created: function () {
+    this.$store.commit('changeUri', this.$router.currentRoute.fullPath)
   }
+}
 
 </script>