Fix a few bugs

Author: qiaoyuang

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/annotation/DBRow.kt

@@ -18,7 +18,7 @@ package com.ctrip.sqllin.dsl.annotation
 
 /**
  * Annotation for where property
- * @author yaqiao
+ * @author Yuang Qiao
  */
 
 @Target(AnnotationTarget.CLASS)

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/annotation/DslMaker.kt

@@ -18,7 +18,7 @@ package com.ctrip.sqllin.dsl.annotation
 
 /**
  * Dsl maker annotations
- * @author yaqiao
+ * @author Yuang Qiao
  */
 
 @DslMarker

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/compiler/EncodeEntities2SQL.kt

@@ -33,50 +33,29 @@ internal fun <T> encodeEntities2InsertValues(
 ) = with(builder) {
     val isInsertId = table.primaryKeyInfo?.run {
         !isRowId || isInsertWithId
-    } ?: false
+    } ?: true
     val serializer = table.kSerializer()
     append('(')
     val primaryKeyIndex = appendDBColumnName(serializer.descriptor, table.primaryKeyInfo?.primaryKeyName, isInsertId)
+    if (primaryKeyIndex >= 0)
+        parameters.removeAt(primaryKeyIndex)
     append(')')
     append(" values ")
     val iterator = values.iterator()
-    if (isInsertId) {
-        fun appendNext() {
-            val value = iterator.next()
-            val encoder = InsertValuesEncoder(parameters)
-            encoder.encodeSerializableValue(serializer, value)
-            append(encoder.valuesSQL)
-        }
-        if (iterator.hasNext()) {
-            appendNext()
-        } else {
-            return@with
-        }
-        while (iterator.hasNext()) {
-            append(',')
-            appendNext()
-        }
+    fun appendNext() {
+        val value = iterator.next()
+        val encoder = InsertValuesEncoder(parameters)
+        encoder.encodeSerializableValue(serializer, value)
+        append(encoder.valuesSQL)
+    }
+    if (iterator.hasNext()) {
+        appendNext()
     } else {
-        var index = 0
-        fun appendNextWithoutPrimaryKey() {
-            val value = iterator.next()
-            if (index != primaryKeyIndex) {
-                val encoder = InsertValuesEncoder(parameters)
-                encoder.encodeSerializableValue(serializer, value)
-                append(encoder.valuesSQL)
-            }
-        }
-        if (iterator.hasNext()) {
-            appendNextWithoutPrimaryKey()
-            index++
-        } else {
-            return@with
-        }
-        while (iterator.hasNext()) {
-            append(',')
-            appendNextWithoutPrimaryKey()
-            index++
-        }
+        return@with
+    }
+    while (iterator.hasNext()) {
+        append(',')
+        appendNext()
     }
 }
 
@@ -88,7 +67,7 @@ internal fun StringBuilder.appendDBColumnName(
     appendDBColumnName(descriptor)
     -1
 } else {
-    var index = 0
+    var index = -1
     if (descriptor.elementsCount > 0) {
         val elementName = descriptor.getElementName(0)
         if (elementName != primaryKeyName)
@@ -98,7 +77,7 @@ internal fun StringBuilder.appendDBColumnName(
     }
     for (i in 1 ..< descriptor.elementsCount) {
         append(',')
-        val elementName = descriptor.getElementName(9)
+        val elementName = descriptor.getElementName(i)
         if (elementName != primaryKeyName)
             append(elementName)
         else

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/operation/Create.kt

@@ -53,7 +53,7 @@ internal object Create : Operation {
                     startsWith(FullNameCache.DOUBLE) -> " DOUBLE"
                     startsWith(FullNameCache.BOOLEAN) -> " BOOLEAN"
                     startsWith(FullNameCache.CHAR) -> " CHAR(1)"
-                    startsWith(FullNameCache.STRING) -> " STRING"
+                    startsWith(FullNameCache.STRING) -> " TEXT"
                     startsWith(FullNameCache.BYTE_ARRAY) -> " BLOB"
                     else -> throw IllegalStateException("Hasn't support the type '$this' yet")
                 }

sqllin-processor/src/main/kotlin/com/ctrip/sqllin/processor/ClauseProcessor.kt

@@ -149,6 +149,7 @@ class ClauseProcessor(
                 // Write the override instance for property `primaryKeyInfo`.
                 if (primaryKeyName == null && compositePrimaryKeys.isEmpty()) {
                     writer.write("    override val primaryKeyInfo = null\n\n")
+                    writer.write("}\n")
                     return@use
                 }
                 writer.write("    override val primaryKeyInfo = PrimaryKeyInfo(\n")