From f2ff0c77e28ef9735f8971fdd4ec9a8c73db207e Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 25 Aug 2012 11:35:44 +0200
Subject: [PATCH] [#430] Add support for the Firebird database - Changed
 connection URL to fix binding of null values

---
 .../configuration/lukas/firebird/library.properties    |  2 +-
 .../org/jooq/configuration/lukas/firebird/library.xml  |  2 +-
 .../org/jooq/test/_/testcases/ThreadSafetyTests.java   |  6 ++++++
 jOOQ/src/main/java/org/jooq/impl/Val.java              | 10 ++--------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.properties
index 2079136d7f..70095fbcb3 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.properties
@@ -1,6 +1,6 @@
 #example properties file
 jdbc.Driver=org.firebirdsql.jdbc.FBDriver
-jdbc.URL=jdbc:firebirdsql:local:C:/data/firebird/test.db
+jdbc.URL=jdbc:firebirdsql:localhost:C:/data/firebird/test.db
 jdbc.User=TEST
 jdbc.Password=TEST
 
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
index 41b882f76c..944de34b9c 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
@@ -2,7 +2,7 @@
 <configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd">
     <jdbc>
         <driver>org.firebirdsql.jdbc.FBDriver</driver>
-        <url>jdbc:firebirdsql:local:C:/data/firebird/test.db</url>
+        <url>jdbc:firebirdsql:localhost:C:/data/firebird/test.db</url>
         <properties>
         	<property>
         		<key>user</key>
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
index 59b968a39c..19f910e9ec 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
@@ -36,6 +36,7 @@
 package org.jooq.test._.testcases;
 
 import static junit.framework.Assert.assertEquals;
+import static org.jooq.SQLDialect.FIREBIRD;
 
 import org.jooq.TableRecord;
 import org.jooq.UpdatableRecord;
@@ -72,6 +73,11 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
 
     @Test
     public void testConcurrentExecution() throws Exception {
+        if (getDialect() == FIREBIRD) {
+            log.info("SKIPPING", "Thread-safety tests. This can crash Firebird");
+            return;
+        }
+
         // This test is an adapted version of a test case contributed by
         // Sergey Epik for [#1543]
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index 6bdef0468a..05fc1975ca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -59,7 +59,6 @@ import java.util.Arrays;
 
 import org.jooq.ArrayRecord;
 import org.jooq.BindContext;
-import org.jooq.Context;
 import org.jooq.Converter;
 import org.jooq.DataType;
 import org.jooq.EnumType;
@@ -541,7 +540,7 @@ class Val<T> extends AbstractField<T> implements Param<T> {
     public final void bind(BindContext context) {
 
         // [#1302] Bind value only if it was not explicitly forced to be inlined
-        if (!isInline(context)) {
+        if (!isInline()) {
             context.bindValue(getValue(), getType());
         }
     }
@@ -585,12 +584,7 @@ class Val<T> extends AbstractField<T> implements Param<T> {
         return inline;
     }
 
-    private final boolean isInline(Context<?> context) {
-        // It looks as though jaybird cannot properly bind NULL!
-        return isInline() || (context.getDialect() == FIREBIRD && value == null);
-    }
-
     private final boolean isInline(RenderContext context) {
-        return isInline((Context<?>) context) || context.inline();
+        return isInline() || context.inline();
     }
 }