github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1153] Bad inlining of booleans in Sybase ASE / DB2 / Oracle / SQL Server / SQLite

Browse Source
This commit is contained in:
Lukas Eder 2012-02-16 22:23:15 +00:00
parent 17a61d8856
commit 83ee1dc699
4 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
View File

@ -1091,4 +1091,4 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
assertEquals(new Time(0), record.getValue("t"));
assertEquals(new Timestamp(0), record.getValue("ts"));
}
}
}

69
jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
View File

@ -41,9 +41,15 @@ import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.fail;
import static org.jooq.impl.Factory.field;
import static org.jooq.impl.Factory.param;
import static org.jooq.impl.Factory.vals;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Arrays;
import org.jooq.Insert;
@ -52,6 +58,10 @@ import org.jooq.Result;
import org.jooq.Select;
import org.jooq.TableRecord;
import org.jooq.UpdatableRecord;
import org.jooq.conf.Execution;
import org.jooq.conf.Settings;
import org.jooq.conf.StatementType;
import org.jooq.impl.Factory;
import org.jooq.test.BaseTest;
import org.jooq.test.jOOQAbstractTest;
@ -257,4 +267,63 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
assertEquals(1, result2.getValue(0, 0));
assertEquals(2, result2.getValue(1, 0));
}
@Test
public void testInlinedBindValues() throws Exception {
// [#1147] Some data types need special care when inlined
String s1 = "test";
String s2 = "no SQL 'injection here; <<`'";
String s3 = "''";
String s4 = null;
Byte b1 = Byte.valueOf("1");
Byte b2 = null;
Short sh1 = Short.valueOf("2");
Short sh2 = null;
Integer i1 = 3;
Integer i2 = null;
Long l1 = 4L;
Long l2 = null;
BigInteger bi1 = new BigInteger("5");
BigInteger bi2 = null;
BigDecimal bd1 = new BigDecimal("6.01");
BigDecimal bd2 = null;
Double db1 = 7.25;
Double db2 = null;
Float f1 = 8.5f;
Float f2 = null;
Date d1 = Date.valueOf("1981-07-10");
Date d2 = null;
Time t1 = Time.valueOf("12:01:15");
Time t2 = null;
Timestamp ts1 = Timestamp.valueOf("1981-07-10 12:01:15");
Timestamp ts2 = null;
byte[] by1 = null; // "some bytes".getBytes();
byte[] by2 = null;
Boolean bool1 = true;
Boolean bool2 = false;
Boolean bool3 = null;
Factory create = create(new Settings()
.withExecution(new Execution()
.withStatementType(StatementType.STATEMENT)));
Object[] array1 = create.select(vals(s1, s2, s3, s4)).fetchOneArray();
Object[] array2 = create.select(vals(b1, b2, sh1, sh2, i1, i2, l1, l2, bi1, bi2, bd1, bd2, db1, db2, f1, f2)).fetchOneArray();
Object[] array3 = create.select(vals(d1, d2, t1, t2, ts1, ts2)).fetchOneArray();
Object[] array4 = create.select(vals(by1, by2, bool1, bool2, bool3)).fetchOneArray();
assertEquals(4, array1.length);
assertEquals(16, array2.length);
assertEquals(6, array3.length);
assertEquals(5, array4.length);
assertEquals(asList(s1, s2, s3, s4), asList(array1));
assertEquals(asList((Number) b1, b2, sh1, sh2, i1, i2, l1, l2, bi1, bi2, bd1, bd2, db1, db2, f1, f2), asList(array2));
assertEquals(asList(d1, d2, t1, t2, ts1, ts2), asList(array3));
assertEquals(asList(by1, by2, bool1, bool2, bool3), asList(array4));
}
}

5
jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
View File

@ -1294,6 +1294,11 @@ public abstract class jOOQAbstractTest<
new RenderAndBindTests(this).testSelectBindValuesWithPlainSQL();
}
@Test
public void testInlinedBindValues() throws Exception {
new RenderAndBindTests(this).testInlinedBindValues();
}
@Test
public void testPivotClause() throws Exception {
new ExoticTests(this).testPivotClause();

14
jOOQ/src/main/java/org/jooq/impl/Val.java
View File

@ -36,12 +36,16 @@
package org.jooq.impl;
import static java.util.Arrays.asList;
import static org.jooq.SQLDialect.ASE;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.INGRES;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLITE;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.SQLDialect.SYBASE;
import java.math.BigDecimal;
@ -251,7 +255,15 @@ class Val<T> extends AbstractField<T> implements Param<T>, BindingProvider {
context.sql("null");
}
else if (type == Boolean.class) {
context.sql(val.toString());
// [#1153] Some dialects don't support boolean literals
// TRUE and FALSE
if (asList(ASE, DB2, ORACLE, SQLSERVER, SQLITE, SYBASE).contains(context.getDialect())) {
context.sql(((Boolean) val) ? "1" : "0");
}
else {
context.sql(val.toString());
}
}
else if (type == byte[].class) {
context.sql("'")