Fix negative identifier in cursor (#86)

* Fix negative identifier in cursor

* Fix Int escaping

Co-authored-by: hfhbd <[email protected]>

Author: hfhbd

postgres-native-sqldelight-driver/src/commonMain/kotlin/app/softwork/sqldelight/postgresdriver/PostgresNativeDriver.kt

@@ -104,14 +104,16 @@ public class PostgresNativeDriver(private var conn: CPointer<PGconn>) : SqlDrive
         return result.value != null
     }
 
+    private fun Int.escapeNegative(): String = if(this < 0) "_${toString().substring(1)}" else toString()
+
     override fun <R> executeQuery(
         identifier: Int?,
         sql: String,
         mapper: (SqlCursor) -> R,
         parameters: Int,
         binders: (SqlPreparedStatement.() -> Unit)?
     ): QueryResult.Value<R> {
-        val cursorName = if (identifier == null) "myCursor" else "cursor$identifier"
+        val cursorName = if (identifier == null) "myCursor" else "cursor${identifier.escapeNegative()}"
         val cursor = "DECLARE $cursorName CURSOR FOR"
         val preparedStatement = if (parameters != 0) {
             PostgresPreparedStatement(parameters).apply {

postgres-native-sqldelight-driver/src/commonTest/kotlin/app/softwork/sqldelight/postgresdriver/PostgresNativeDriverTest.kt

@@ -131,7 +131,7 @@ class PostgresNativeDriverTest {
         )
         assertEquals(0, driver.execute(null, "DROP TABLE IF EXISTS copying;", parameters = 0).value)
         assertEquals(0, driver.execute(null, "CREATE TABLE copying(a int primary key);", parameters = 0).value)
-        driver.execute(42, "COPY copying FROM STDIN (FORMAT CSV);", 0)
+        driver.execute(-42, "COPY copying FROM STDIN (FORMAT CSV);", 0)
         val results = driver.copy("1\n2\n")
         assertEquals(2, results)
     }

testing/src/commonMain/sqldelight/app/softwork/sqldelight/postgresdriver/1.sqm

@@ -1,4 +1,5 @@
 DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS users;
 
 CREATE TABLE foo(
 a INT PRIMARY KEY,
@@ -10,3 +11,11 @@ instant TIMESTAMPTZ NOT NULL,
 interval INTERVAL NOT NULL,
 uuid UUID NOT NULL
 );
+
+CREATE TABLE IF NOT EXISTS users(
+    id BIGSERIAL PRIMARY KEY,
+    email VARCHAR(200) NOT NULL UNIQUE,
+    username VARCHAR(100) NOT NULL UNIQUE,
+    bio VARCHAR(1000) NOT NULL DEFAULT '',
+    image VARCHAR(255) NOT NULL DEFAULT ''
+);

testing/src/commonMain/sqldelight/app/softwork/sqldelight/postgresdriver/Users.sq

@@ -0,0 +1,8 @@
+insert:
+INSERT INTO users(email, username, bio, image)
+VALUES (?, ?, ?, ?);
+
+selectByUsername:
+SELECT email, username, bio, image
+FROM users
+WHERE username = :username;

testing/src/commonTest/kotlin/app/softwork/sqldelight/postgresdriver/PostgresNativeDriverTest.kt

@@ -6,15 +6,16 @@ import kotlin.test.*
 import kotlin.time.Duration.Companion.seconds
 
 class PostgresNativeDriverTest {
+    private val driver = PostgresNativeDriver(
+        host = "localhost",
+        port = 5432,
+        user = "postgres",
+        database = "postgres",
+        password = "password"
+    )
+
     @Test
     fun allTypes() {
-        val driver = PostgresNativeDriver(
-            host = "localhost",
-            port = 5432,
-            user = "postgres",
-            database = "postgres",
-            password = "password"
-        )
         val queries = NativePostgres(driver).fooQueries
         NativePostgres.Schema.migrate(driver, 0, NativePostgres.Schema.version)
         assertEquals(emptyList(), queries.get().executeAsList())
@@ -44,17 +45,11 @@ class PostgresNativeDriverTest {
 
     @Test
     fun copyTest() {
-        val driver = PostgresNativeDriver(
-            host = "localhost",
-            port = 5432,
-            user = "postgres",
-            database = "postgres",
-            password = "password"
-        )
         val queries = NativePostgres(driver).fooQueries
         NativePostgres.Schema.migrate(driver, 0, NativePostgres.Schema.version)
         queries.startCopy()
-        val result = driver.copy("42,answer,2020-12-12,12:42:00.0000,2014-08-01T12:01:02.0000,1970-01-01T00:00:00.010Z,PT42S,00000000-0000-0000-0000-000000000000")
+        val result =
+            driver.copy("42,answer,2020-12-12,12:42:00.0000,2014-08-01T12:01:02.0000,1970-01-01T00:00:00.010Z,PT42S,00000000-0000-0000-0000-000000000000")
         assertEquals(1, result)
         val foo = Foo(
             a = 42,
@@ -68,4 +63,21 @@ class PostgresNativeDriverTest {
         )
         assertEquals(foo, queries.get().executeAsOne())
     }
+
+    @Test
+    fun userTest() {
+        val queries = NativePostgres(driver).usersQueries
+        NativePostgres.Schema.migrate(driver, 0, NativePostgres.Schema.version)
+        queries.insert("test@test", "test", "bio", "")
+        val testUser = queries.selectByUsername("test").executeAsOne()
+        assertEquals(
+            SelectByUsername(
+                "test@test",
+                "test",
+                "bio",
+                ""
+            ),
+            testUser
+        )
+    }
 }