Merge pull request #55 from Paulanerus/dev

Dev

Author: Paulanerus

core/src/main/kotlin/dev/paulee/core/Utility.kt

@@ -30,7 +30,12 @@ fun normalizeSourceName(str: String): String {
     return (if (needsUnderscore) "_$replaced" else replaced).trim()
 }
 
-fun splitStr(str: String, delimiter: Char, quoteCharacters: Array<Char> = arrayOf('"')): List<String> {
+fun splitStr(
+    str: String,
+    delimiter: Char,
+    quoteCharacters: Array<Char> = arrayOf('"'),
+    includeQuotation: Boolean = false,
+): List<String> {
     val result = ArrayList<String>()
     val sb = StringBuilder(str.length)
 
@@ -40,7 +45,12 @@ fun splitStr(str: String, delimiter: Char, quoteCharacters: Array<Char> = arrayO
 
         for (c in str) {
             when (c) {
-                quote -> inside = !inside
+                quote -> {
+                    inside = !inside
+
+                    if (includeQuotation) sb.append(c)
+                }
+
                 delimiter if !inside -> {
                     result.add(sb.toString())
                     sb.setLength(0)
@@ -55,6 +65,7 @@ fun splitStr(str: String, delimiter: Char, quoteCharacters: Array<Char> = arrayO
         for (c in str) {
             if (quoteCharacters.contains(c)) {
                 inside = !inside
+                if (includeQuotation) sb.append(c)
             } else if (c == delimiter && !inside) {
                 result.add(sb.toString())
                 sb.setLength(0)

core/src/main/kotlin/dev/paulee/core/data/model/DataPool.kt

@@ -111,19 +111,17 @@ internal class DataPool(val indexer: Indexer?, val dataInfo: DataInfo, val stora
 
             val queryToken = mutableListOf<String>()
 
-            splitStr(query, delimiter = ' ').forEach { str ->
+            splitStr(query, delimiter = ' ', includeQuotation = true).forEach { str ->
 
                 var colon = -1
-                var hasSpace = false
 
                 for (i in str.indices) {
                     val ch = str[i]
                     if (ch == ':') { colon = i; break }
-                    if (ch == ' ') hasSpace = true
                 }
 
                 if (colon == -1) {
-                    queryToken.add(if (hasSpace) "\"$str\"" else str)
+                    queryToken.add(str)
                     return@forEach
                 }
 

gradle.properties

@@ -15,6 +15,6 @@ duckdb.version=1.4.1.0
 caffeine.version=3.2.2
 
 api.version=1.16.4
-core.version=1.18.12
+core.version=1.18.13
 ui.version=1.19.5
-app.version=1.6.5
+app.version=1.6.6