Simplify

Author: simolus3

common/src/nativeMain/kotlin/com/powersync/db/NativeConnectionFactory.kt

@@ -1,16 +1,24 @@
 package com.powersync.db
 
 import androidx.sqlite.SQLiteConnection
+import com.powersync.ExperimentalPowerSyncAPI
 import com.powersync.PersistentConnectionFactory
 import com.powersync.PowerSyncException
+import com.powersync.resolvePowerSyncLoadableExtensionPath
 import com.powersync.sqlite.Database
 
 /**
  * A [PersistentConnectionFactory] implementation delegating to static `sqlite3_` invocations through cinterop.
  */
-public abstract class NativeConnectionFactory: PersistentConnectionFactory {
-    override fun openConnection(path: String, openFlags: Int): SQLiteConnection {
-        val extensionPath = powersyncLoadableExtensionPath()
+public abstract class NativeConnectionFactory : PersistentConnectionFactory {
+    @OptIn(ExperimentalPowerSyncAPI::class)
+    override fun openConnection(
+        path: String,
+        openFlags: Int,
+    ): SQLiteConnection {
+        // On some platforms, most notably watchOS, there's no dynamic extension loading and the core extension is
+        // registered via sqlite3_auto_extension.
+        val extensionPath = resolvePowerSyncLoadableExtensionPath()
         val db = Database.open(path, openFlags)
 
         if (extensionPath != null) {
@@ -25,14 +33,5 @@ public abstract class NativeConnectionFactory: PersistentConnectionFactory {
         return db
     }
 
-    override fun openInMemoryConnection(): SQLiteConnection {
-        return openConnection(":memory:", 0x02)
-    }
-
-    /**
-     * If the core extension should be loaded as a dynamic library, returns its path.
-     *
-     * Otherwise, installs the core extension as a static extension and returns null.
-     */
-    protected abstract fun powersyncLoadableExtensionPath(): String?
+    override fun openInMemoryConnection(): SQLiteConnection = openConnection(":memory:", 0x02)
 }

core/src/nativeMain/kotlin/com/powersync/DatabaseDriverFactory.native.kt

@@ -1,35 +1,10 @@
 package com.powersync
 
-import androidx.sqlite.SQLiteConnection
-import com.powersync.sqlite.Database
+import com.powersync.db.NativeConnectionFactory
 
 @Suppress(names = ["EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING"])
-public actual class DatabaseDriverFactory : PersistentConnectionFactory {
+public actual class DatabaseDriverFactory : NativeConnectionFactory() {
     actual override fun resolveDefaultDatabasePath(dbFilename: String): String = appleDefaultDatabasePath(dbFilename)
-
-    @OptIn(ExperimentalPowerSyncAPI::class)
-    actual override fun openConnection(
-        path: String,
-        openFlags: Int,
-    ): SQLiteConnection {
-        // On some platforms, most notably watchOS, there's no dynamic extension loading and the core extension is
-        // registered via sqlite3_auto_extension.
-        val extensionPath = resolvePowerSyncLoadableExtensionPath()
-
-        val db = Database.open(path, openFlags)
-        extensionPath?.let { path ->
-            try {
-                db.loadExtension(path, "sqlite3_powersync_init")
-            } catch (e: PowerSyncException) {
-                db.close()
-                throw e
-            }
-        }
-
-        return db
-    }
-
-    actual override fun openInMemoryConnection(): SQLiteConnection = openConnection(":memory:", 0x02)
 }
 
 internal actual val inMemoryDriver: InMemoryConnectionFactory = DatabaseDriverFactory()

internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt

@@ -18,15 +18,12 @@ import io.ktor.client.plugins.logging.Logger as KtorLogger
 public fun sqlite3DatabaseFactory(initialStatements: List<String>): PersistentConnectionFactory {
     @OptIn(ExperimentalPowerSyncAPI::class)
     return object : NativeConnectionFactory() {
-        override fun powersyncLoadableExtensionPath(): String? {
-            return resolvePowerSyncLoadableExtensionPath()
-        }
-
-        override fun resolveDefaultDatabasePath(dbFilename: String): String {
-            return appleDefaultDatabasePath(dbFilename)
-        }
+        override fun resolveDefaultDatabasePath(dbFilename: String): String = appleDefaultDatabasePath(dbFilename)
 
-        override fun openConnection(path: String, openFlags: Int): SQLiteConnection {
+        override fun openConnection(
+            path: String,
+            openFlags: Int,
+        ): SQLiteConnection {
             val conn = super.openConnection(path, openFlags)
             try {
                 for (statement in initialStatements) {