Merge pull request #44 from qiaoyuang/main

Add the New JVM Target
ctripcorp · Sep 19, 2023 · 3893d79 · 3893d79
2 parents 1c46aaa + 4aa6cd1
commit 3893d79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,17 +51,17 @@ jobs:
       - name: Run sqllin-driver macOS X64 Tests
         run: ./test_driver_macos.sh
 
-      #- name: Run sqllin-driver JVM Unit Tests on macOS X64
-        #run: ./test_driver_jvm.sh
+      - name: Run sqllin-driver JVM Unit Tests on macOS X64
+        run: ./test_driver_jvm.sh
 
       - name: Build sqllin-dsl
         run: ./gradlew :sqllin-dsl:assemble
 
       - name: Run sqllin-dsl macOS X64 Tests
         run: ./test_dsl_macos.sh
 
-      #- name: Run sqllin-dsl JVM Unit Tests on macOS X64
-        #run: ./test_dsl_jvm.sh
+      - name: Run sqllin-dsl JVM Unit Tests on macOS X64
+        run: ./test_dsl_jvm.sh
 
       - name: Gradle Cache
         uses: gradle/gradle-build-action@v2
@@ -208,8 +208,8 @@ jobs:
       - name: Run sqllin-driver Linux X64 Tests
         run: ./test_driver_linux.sh
 
-      #- name: Run sqllin-driver JVM Unit Tests on Linux X64
-        #run: ./test_driver_jvm.sh
+      - name: Run sqllin-driver JVM Unit Tests on Linux X64
+        run: ./test_driver_jvm.sh
 
       - name: Build sqllin-processor
         run: ./gradlew :sqllin-processor:assemble
@@ -220,8 +220,8 @@ jobs:
       - name: Run sqllin-dsl Linux X64 Tests
         run: ./test_dsl_linux.sh
 
-      #- name: Run sqllin-dsl JVM Unit Tests on Linux X64
-        #run: ./test_dsl_jvm.sh
+      - name: Run sqllin-dsl JVM Unit Tests on Linux X64
+        run: ./test_dsl_jvm.sh
 
       - name: Gradle Cache
         uses: gradle/gradle-build-action@v2

diff --git a/sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt b/sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt
@@ -236,7 +236,7 @@ class CommonBasicTest(private val path: DatabasePath) {
         val book0 = Book(name = "The Da Vinci Code", author = "Dan Brown", pages = 454, price = 16.96)
         val book1 = Book(name = "Kotlin Cookbook", author = "Ken Kousen", pages = 251, price = 37.72)
         val book2 = Book(name = "The Lost Symbol", author = "Dan Brown", pages = 510, price = 19.95)
-        val book3 = Book(name = "Kotlin Guide Pratique", author = "Ken Kousen", pages = 398, price = 39.99)
+        val book3 = Book(name = "Kotlin Guide Pratique", author = "Ken Kousen", pages = 398, price = 40.08)
         var statement: SelectStatement<Book>? = null
         database {
             statement = BookTable { table ->
@@ -250,9 +250,6 @@ class CommonBasicTest(private val path: DatabasePath) {
                 }
             }
         }
-        statement!!.getResults().forEach {
-            println(it)
-        }
         assertEquals(7, statement!!.getResults().size)
         assertEquals(2, statement!!.getResults().count { it == book0 })
         assertEquals(2, statement!!.getResults().count { it == book1 })