Merge pull request #112 from touchlab/qiaoyuang-main

Qiaoyuang main
touchlab · Nov 5, 2023 · db3d704 · db3d704
2 parents ba4ff02 + 8968474
commit db3d704
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/native/NativeCursor.kt b/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/native/NativeCursor.kt
@@ -37,7 +37,18 @@ class NativeCursor(override val statement: NativeStatement) : Cursor {
     override val columnNames: Map<String, Int> by lazy {
         val map = HashMap<String, Int>(this.columnCount)
         for (i in 0 until columnCount) {
-            map.put(columnName(i), i)
+            val key = columnName(i)
+            if (map.containsKey(key)) {
+                var index = 1
+                val basicKey = "$key&JOIN"
+                var finalKey = basicKey + index
+                while (map.containsKey(finalKey)) {
+                    finalKey = basicKey + ++index
+                }
+                map[finalKey] = i
+            } else {
+                map[key] = i
+            }
         }
         map
     }