Refactor result conversion and metadata properties

Updated function names from `toKotlinResult` to `toResult` to enhance clarity and consistency across the codebase. Refactored `name` and `type` properties in `Column` class to use `by lazy` for improved performance and readability.
smyrgeorge · Nov 3, 2024 · 236a7f3 · 236a7f3
1 parent cfc3e4c
commit 236a7f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/sqlx4k-mysql/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/mysql/MySQL.kt b/sqlx4k-mysql/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/mysql/MySQL.kt
@@ -68,7 +68,7 @@ class MySQL(
 
     override suspend fun fetchAll(sql: String): Result<ResultSet> {
         val res = sqlx { c -> sqlx4k_fetch_all(sql, c, Driver.fn) }
-        return ResultSet(res).toKotlinResult()
+        return ResultSet(res).toResult()
     }
 
     override suspend fun fetchAll(statement: Statement): Result<ResultSet> =
@@ -115,7 +115,7 @@ class MySQL(
             }
 
             tx = res.getRaw().tx!!
-            return res.toKotlinResult()
+            return res.toResult()
         }
 
         override suspend fun fetchAll(statement: Statement): Result<ResultSet> =

diff --git a/sqlx4k-postgres/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/postgres/PostgreSQL.kt b/sqlx4k-postgres/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/postgres/PostgreSQL.kt
@@ -86,7 +86,7 @@ class PostgreSQL(
 
     override suspend fun fetchAll(sql: String): Result<ResultSet> {
         val res = sqlx { c -> sqlx4k_fetch_all(sql, c, Driver.fn) }
-        return ResultSet(res).toKotlinResult()
+        return ResultSet(res).toResult()
     }
 
     override suspend fun fetchAll(statement: Statement): Result<ResultSet> =
@@ -172,7 +172,7 @@ class PostgreSQL(
             }
 
             tx = res.getRaw().tx!!
-            return res.toKotlinResult()
+            return res.toResult()
         }
 
         override suspend fun fetchAll(statement: Statement): Result<ResultSet> =

diff --git a/sqlx4k-sqlite/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqlite/SQLite.kt b/sqlx4k-sqlite/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/sqlite/SQLite.kt
@@ -60,7 +60,7 @@ class SQLite(
 
     override suspend fun fetchAll(sql: String): Result<ResultSet> {
         val res = sqlx { c -> sqlx4k_fetch_all(sql, c, Driver.fn) }
-        return ResultSet(res).toKotlinResult()
+        return ResultSet(res).toResult()
     }
 
     override suspend fun fetchAll(statement: Statement): Result<ResultSet> =
@@ -107,7 +107,7 @@ class SQLite(
             }
 
             tx = res.getRaw().tx!!
-            return res.toKotlinResult()
+            return res.toResult()
         }
 
         override suspend fun fetchAll(statement: Statement): Result<ResultSet> =

diff --git a/sqlx4k/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/ResultSet.kt b/sqlx4k/src/nativeMain/kotlin/io/github/smyrgeorge/sqlx4k/ResultSet.kt
@@ -74,7 +74,7 @@ class ResultSet(
      * @return A successful [Result] containing the current [ResultSet] if no error,
      *         or a failed [Result] with the appropriate [SQLError].
      */
-    fun toKotlinResult(): Result<ResultSet> =
+    fun toResult(): Result<ResultSet> =
         if (isError()) {
             val error = toError()
             close()
@@ -166,7 +166,7 @@ class ResultSet(
              * This property provides access to the name of the column
              * as defined in the metadata, based on the column's ordinal index.
              */
-            val name: String get() = metadata.getColumn(ordinal).name
+            val name: String by lazy { metadata.getColumn(ordinal).name }
 
             /**
              * Retrieves the ordinal position of this column within the database table.
@@ -184,7 +184,7 @@ class ResultSet(
              *
              * @return The type of the column in String format.
              */
-            val type: String get() = metadata.getColumn(ordinal).type
+            val type: String by lazy { metadata.getColumn(ordinal).type }
 
             /**
              * Retrieves the value of the column as a nullable String.