Fix Table.ndarray and add a test for it

closes #13

Author: Martmists-GH

README.md

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.martmists.ndarray-simd:ndarray-simd:1.5.1")
+    implementation("com.martmists.ndarray-simd:ndarray-simd:1.5.2")
 }
 ```
 

build.gradle.kts

@@ -17,7 +17,7 @@ plugins {
 }
 
 group = "com.martmists.ndarray-simd"
-version = "1.5.1"
+version = "1.5.2"
 val isProduction = (findProperty("production") ?: System.getProperty("production")) != null
 
 repositories {
@@ -293,6 +293,10 @@ kotlin {
                 implementation("com.sksamuel.scrimage:scrimage-core:4.1.3")
                 implementation("dev.langchain4j:langchain4j:0.32.0")
                 implementation("org.jetbrains.kotlinx:dataframe-core:0.13.1")
+
+                implementation("org.jetbrains.exposed:exposed-core:0.60.0")
+                implementation("org.jetbrains.exposed:exposed-jdbc:0.60.0")
+                implementation("org.xerial:sqlite-jdbc:3.44.1.0")
             }
         }
 

src/jvmMain/kotlin/com/martmists/ndarray/simd/compat/exposed_doublearray.kt

@@ -6,7 +6,10 @@ import com.martmists.ndarray.simd.impl.create
 import com.martmists.ndarray.simd.impl.product
 import org.jetbrains.exposed.sql.Column
 import org.jetbrains.exposed.sql.ColumnType
+import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.Table
+import org.jetbrains.exposed.sql.statements.api.ExposedBlob
+import org.jetbrains.exposed.sql.statements.api.PreparedStatementApi
 import org.jetbrains.exposed.sql.vendors.SQLServerDialect
 import org.jetbrains.exposed.sql.vendors.currentDialect
 import java.io.InputStream
@@ -29,14 +32,20 @@ internal class F64ArrayColumnType : ColumnType<F64Array>() {
         else -> error("Unexpected value of type F64Array: $value of ${value::class.qualifiedName}")
     }
 
-    override fun nonNullValueToString(value: F64Array) = currentDialect.dataTypeProvider.hexToDb(store(value).toHexString())
-    private fun ByteArray.toHexString(): String = joinToString(separator = "") { eachByte -> "%02x".format(eachByte) }
+    override fun notNullValueToDB(value: F64Array) = ExposedBlob(store(value))
 
     override fun readObject(rs: ResultSet, index: Int) = when {
         currentDialect is SQLServerDialect -> rs.getBytes(index)?.let(F64ArrayColumnType::parse)
         else -> rs.getBinaryStream(index)?.let(F64ArrayColumnType::parse)
     }
 
+    override fun setParameter(stmt: PreparedStatementApi, index: Int, value: Any?) {
+        when (val toSetValue = (value as? ExposedBlob)?.inputStream ?: value) {
+            is InputStream -> stmt.setInputStream(index, toSetValue, false)
+            else -> super.setParameter(stmt, index, toSetValue)
+        }
+    }
+
     companion object {
         @JvmStatic
         fun store(data: F64Array): ByteArray {
@@ -78,5 +87,4 @@ internal class F64ArrayColumnType : ColumnType<F64Array>() {
  * @param size The size of the vector.
  * @since 1.4.3
  */
-@Deprecated("Currently not working as expected!")
 fun Table.ndarray(name: String): Column<F64Array> = registerColumn(name, F64ArrayColumnType())

src/jvmTest/kotlin/SqliteTest.kt

@@ -0,0 +1,41 @@
+import com.martmists.ndarray.simd.F64Array
+import com.martmists.ndarray.simd.compat.ndarray
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.SchemaUtils
+import org.jetbrains.exposed.sql.Table
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
+import java.io.File
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class SqliteTest {
+    object MyTable : Table() {
+        val arr = ndarray("test")
+    }
+
+    @Test
+    fun testSerialization() {
+        val arr1 = F64Array.random(10, 10)
+
+        val db = Database.connect("jdbc:sqlite:./data.sqlite3", "org.sqlite.JDBC")
+        File("./data.sqlite3").deleteOnExit()
+
+        transaction(db) {
+            SchemaUtils.createMissingTablesAndColumns(MyTable)
+
+            MyTable.insert {
+                it[MyTable.arr] = arr1
+            }
+        }
+
+        val arr2 = transaction(db) {
+            val row = MyTable.selectAll().first()
+            row[MyTable.arr]
+        }
+
+        assertEquals(arr1, arr2)
+
+    }
+}