remove error parsed statement

dboissin · dboissin · commit 75f0cfbde437 · 2014-08-03T23:05:42.000+02:00
diff --git a/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/PostgreSQLConnection.scala b/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/PostgreSQLConnection.scala
@@ -150,6 +150,7 @@ class PostgreSQLConnection
       this.disconnect
     }
 
+    this.currentPreparedStatement.map(p => this.parsedStatements.remove(p.query))
     this.currentPreparedStatement = None
     this.failQueryPromise(e)
   }
diff --git a/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/PreparedStatementHolder.scala b/postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/PreparedStatementHolder.scala
@@ -18,7 +18,7 @@ package com.github.mauricio.async.db.postgresql
 
 import com.github.mauricio.async.db.postgresql.messages.backend.PostgreSQLColumnData
 
-class PreparedStatementHolder( query : String, val statementId : Int ) {
+class PreparedStatementHolder(val query : String, val statementId : Int ) {
 
   val (realQuery, paramsCount) = {
     val result = new StringBuilder(query.length+16)
diff --git a/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/PreparedStatementSpec.scala b/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/PreparedStatementSpec.scala
@@ -21,6 +21,7 @@ import org.joda.time.LocalDate
 import com.github.mauricio.async.db.util.Log
 import com.github.mauricio.async.db.exceptions.InsufficientParametersException
 import java.util.Date
+import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException
 
 class PreparedStatementSpec extends Specification with DatabaseTestHelper {
 
@@ -265,6 +266,22 @@ class PreparedStatementSpec extends Specification with DatabaseTestHelper {
       }
     }
 
+    "run prepared statement twice with bad and good values" in {
+      withHandler {
+        handler =>
+          val content = "Some Moment"
+
+          val query = "SELECT content FROM messages WHERE id = ?"
+
+          executeDdl(handler, messagesCreate)
+          executePreparedStatement(handler, this.messagesInsert, Array(Some(content), None))
+
+          executePreparedStatement(handler, query, Array("undefined")) must throwA[GenericDatabaseException]
+          val result = executePreparedStatement(handler, query, Array(1)).rows.get
+          result(0)(0) === content
+      }
+    }
+
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ class PostgreSQLConnection`
`150`	`150`	`this.disconnect`
`151`	`151`	`}`
`152`	`152`
	`153`	`+ this.currentPreparedStatement.map(p => this.parsedStatements.remove(p.query))`
`153`	`154`	`this.currentPreparedStatement = None`
`154`	`155`	`this.failQueryPromise(e)`
`155`	`156`	`}`