Merge pull request #59 from qiaoyuang/main

Update the version to 1.2.2

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 - Date format: YYYY-MM-dd
 
-## v1.2.2 / 2023-xx-xx
+## v1.2.2 / 2023-11-08
 
 ### All
 
@@ -22,6 +22,7 @@
 ### sqllin-processor
 
 * Update `KSP`'s version to `1.9.20-1.0.13`
+* Fix the bug for when the code that is generated by `sqllin-processor` can't be compiled([#58](https://github.com/ctripcorp/SQLlin/pull/58))
 
 ## v1.2.1 / 2023-10-18
 

build.gradle.kts

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         val kotlinVersion: String by project
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.1.2")
     }
 }
 
@@ -16,8 +16,4 @@ allprojects {
         google()
         mavenCentral()
     }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
 }

gradle.properties

@@ -1,4 +1,4 @@
-VERSION=1.2.1
+VERSION=1.2.2
 GROUP=com.ctrip.kotlin
 
 kotlinVersion=1.9.20
@@ -25,11 +25,10 @@ org.gradle.caching=true
 #Android
 android.useAndroidX=true
 android.enableJetifier=true
-android.disableAutomaticComponentCreation=true
 
 #Kotlin
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.natvie.increment=true
-#kotlin.compiler.execution.strategy=out-of-process
+#kotlin.compiler.execution.strategy=out-of-process

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Mar 08 15:11:46 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+zipStoreBase=GRADLE_USER_HOME

sqllin-driver/build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
@@ -58,6 +57,14 @@ kotlin {
     ).forEach {
         it.setupNativeConfig()
     }
+
+    targets.configureEach {
+        compilations.configureEach {
+            compilerOptions.configure {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
 
     sourceSets {
         all {
@@ -181,8 +188,4 @@ publishing {
         useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD)
         sign(publishing.publications)
     }
-}
-
-tasks.withType<KotlinCompile> {
-    compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
 }

sqllin-dsl/build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
@@ -60,6 +59,14 @@ kotlin {
     ).forEach {
         it.setupNativeConfig()
     }
+
+    targets.configureEach {
+        compilations.configureEach {
+            compilerOptions.configure {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
 
     sourceSets {
         all {
@@ -113,9 +120,6 @@ android {
 }
 
 fun KotlinNativeTarget.setupNativeConfig() {
-    val compileArgs = listOf("-Xruntime-logs=gc=info")
-    compilations["main"].kotlinOptions.freeCompilerArgs += compileArgs
-    compilations["test"].kotlinOptions.freeCompilerArgs += compileArgs
     binaries {
         all {
             linkerOpts += when {
@@ -215,8 +219,4 @@ publishing {
         useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD)
         sign(publishing.publications)
     }
-}
-
-tasks.withType<KotlinCompile> {
-    compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
 }

sqllin-dsl/doc/getting-start-cn.md

@@ -14,7 +14,7 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-val sqllinVersion = "1.2.1"
+val sqllinVersion = "1.2.2"
 
 kotlin {
     // ......

sqllin-dsl/doc/getting-start.md

@@ -16,7 +16,7 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-val sqllinVersion = "1.2.1"
+val sqllinVersion = "1.2.2"
 
 kotlin {
     // ......

sqllin-dsl/src/androidInstrumentedTest/kotlin/com/ctrip/sqllin/dsl/AndroidTest.kt

@@ -71,6 +71,9 @@ class AndroidTest {
     @Test
     fun testConcurrency() = commonTest.testConcurrency()
 
+    @Test
+    fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
+
     @Before
     fun setUp() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/BaseJoinClause.kt

@@ -47,6 +47,7 @@ public sealed class JoinClause<R>(vararg tables: Table<*>) : BaseJoinClause<R>(*
 public infix fun <R> JoinStatementWithoutCondition<R>.ON(condition: SelectCondition): JoinSelectStatement<R> =
     convertToJoinSelectStatement(condition)
 
+@Suppress("NOTHING_TO_INLINE")
 public inline infix fun <R> JoinStatementWithoutCondition<R>.USING(clauseElement: ClauseElement): JoinSelectStatement<R> =
     USING(listOf(clauseElement))
 

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/InnerJoinClause.kt

@@ -32,6 +32,7 @@ internal class InnerJoinClause<R>(
 
 public fun <R> JOIN(vararg tables: Table<*>): JoinClause<R> = InnerJoinClause(*tables)
 
+@Suppress("NOTHING_TO_INLINE")
 public inline fun <R> INNER_JOIN(vararg tables: Table<*>): JoinClause<R> = JOIN(*tables)
 
 internal class NaturalInnerJoinClause<R>(
@@ -43,4 +44,5 @@ internal class NaturalInnerJoinClause<R>(
 
 public fun <R> NATURAL_JOIN(vararg tables: Table<*>): NaturalJoinClause<R> = NaturalInnerJoinClause(*tables)
 
+@Suppress("NOTHING_TO_INLINE")
 public inline fun <R> NATURAL_INNER_JOIN(vararg tables: Table<*>): NaturalJoinClause<R> = NATURAL_JOIN(*tables)

sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/OrderByClause.kt

@@ -52,6 +52,7 @@ public enum class OrderByWay(internal val str: String) {
 public fun <T> ORDER_BY(vararg column2Ways: Pair<ClauseElement, OrderByWay>): OrderByClause<T> =
     OrderByClause(mapOf(*column2Ways))
 
+@Suppress("NOTHING_TO_INLINE")
 public inline infix fun <T> WhereSelectStatement<T>.ORDER_BY(column2Way: Pair<ClauseElement, OrderByWay>): OrderBySelectStatement<T> =
     ORDER_BY(mapOf(column2Way))
 
@@ -60,6 +61,7 @@ public infix fun <T> WhereSelectStatement<T>.ORDER_BY(column2WayMap: Map<ClauseE
         container changeLastStatement it
     }
 
+@Suppress("NOTHING_TO_INLINE")
 public inline infix fun <T> HavingSelectStatement<T>.ORDER_BY(column2Way: Pair<ClauseElement, OrderByWay>): OrderBySelectStatement<T> =
     ORDER_BY(mapOf(column2Way))
 
@@ -68,6 +70,7 @@ public infix fun <T> HavingSelectStatement<T>.ORDER_BY(column2WayMap: Map<Clause
         container changeLastStatement it
     }
 
+@Suppress("NOTHING_TO_INLINE")
 public inline infix fun <T> GroupBySelectStatement<T>.ORDER_BY(column2Way: Pair<ClauseElement, OrderByWay>): OrderBySelectStatement<T> =
     ORDER_BY(mapOf(column2Way))
 
@@ -76,6 +79,7 @@ public infix fun <T> GroupBySelectStatement<T>.ORDER_BY(column2WayMap: Map<Claus
         container changeLastStatement it
     }
 
+@Suppress("NOTHING_TO_INLINE")
 public inline infix fun <T> JoinSelectStatement<T>.ORDER_BY(column2Way: Pair<ClauseElement, OrderByWay>): OrderBySelectStatement<T> =
     ORDER_BY(mapOf(column2Way))
 

sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt

@@ -384,6 +384,26 @@ class CommonBasicTest(private val path: DatabasePath) {
         Unit
     }
 
+    fun testPrimitiveTypeForKSP() {
+        TestPrimitiveTypeForKSPTable {
+            SET<TestPrimitiveTypeForKSP> {
+                assertEquals(0, testInt)
+                assertEquals(0L, testLong)
+                assertEquals(0, testShort)
+                assertEquals(0, testByte)
+                assertEquals(0F, testFloat)
+                assertEquals(0.0, testDouble)
+                assertEquals(0U, testUInt)
+                assertEquals(0UL, testULong)
+                assertEquals(0U, testUShort)
+                assertEquals(0U, testUByte)
+                assertEquals(false, testBoolean)
+                assertEquals('0', testChar)
+                assertEquals("", testString)
+            }
+        }
+    }
+
     private fun getDefaultDBConfig(): DatabaseConfiguration =
         DatabaseConfiguration(
             name = DATABASE_NAME,

sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/TestPrimitiveTypeForKSP.kt

@@ -0,0 +1,22 @@
+package com.ctrip.sqllin.dsl
+
+import com.ctrip.sqllin.dsl.annotation.DBRow
+import kotlinx.serialization.Serializable
+
+@DBRow
+@Serializable
+data class TestPrimitiveTypeForKSP(
+    val testInt: Int,
+    val testLong: Long,
+    val testShort: Short,
+    val testByte: Byte,
+    val testFloat: Float,
+    val testDouble: Double,
+    val testUInt: UInt,
+    val testULong: ULong,
+    val testUShort: UShort,
+    val testUByte: UByte,
+    val testBoolean: Boolean,
+    val testChar: Char,
+    val testString: String,
+)

sqllin-dsl/src/jvmTest/kotlin/com/ctrip/sqllin/dsl/JvmTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ctrip.com.
+ * Copyright (C) 2023 Ctrip.com.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,9 @@ class JvmTest {
     @Test
     fun testJoinClause() = commonTest.testJoinClause()
 
+    @Test
+    fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
+
     @BeforeTest
     fun setUp() {
         deleteDatabase(path, CommonBasicTest.DATABASE_NAME)

sqllin-dsl/src/nativeTest/kotlin/com/ctrip/sqllin/dsl/NativeTest.kt

@@ -65,6 +65,9 @@ class NativeTest {
     @Test
     fun testConcurrency() = commonTest.testConcurrency()
 
+    @Test
+    fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
+
     @BeforeTest
     fun setUp() {
         deleteDatabase(path, CommonBasicTest.DATABASE_NAME)

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

@@ -129,15 +129,15 @@ class ClauseProcessor(
         property.typeName
     ) {
         Int::class.qualifiedName -> "0"
-        Long::class.qualifiedName -> "0l"
-        Short::class.qualifiedName -> "0s"
-        Byte::class.qualifiedName -> "0b"
-        Float::class.qualifiedName -> "0f"
+        Long::class.qualifiedName -> "0L"
+        Short::class.qualifiedName -> "0"
+        Byte::class.qualifiedName -> "0"
+        Float::class.qualifiedName -> "0F"
         Double::class.qualifiedName -> "0.0"
-        UInt::class.qualifiedName -> "0u"
-        ULong::class.qualifiedName -> "0ul"
-        UShort::class.qualifiedName -> "0us"
-        UByte::class.qualifiedName -> "0ub"
+        UInt::class.qualifiedName -> "0U"
+        ULong::class.qualifiedName -> "0UL"
+        UShort::class.qualifiedName -> "0U"
+        UByte::class.qualifiedName -> "0U"
         Boolean::class.qualifiedName -> "false"
 
         Char::class.qualifiedName -> "'0'"