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

[#3360] SQLite regression when using special characters in identifiers

Browse Source
This commit is contained in:
Lukas Eder 2014-07-11 13:01:29 +02:00
parent 7940d705ac
commit 54594ba78a
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ-test/src/test/java/org/jooq/test/all/testcases/RenderAndBindTests.java
View File

@ -483,6 +483,14 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
}
public void testRenderNameStyle() throws Exception {
// [#3360] With default RenderNameStyle.QUOTED, we should be sure that special characters
// are properly escaped, even in SQLite:
assertEquals(
"test with whitespace",
create().select(val("test with whitespace").as("test with whitespace"))
.fetchOne()
.value1());
Select<?> s =
create(new Settings().withRenderNameStyle(RenderNameStyle.AS_IS))
.select(TBook_ID(), TBook_TITLE(), TAuthor_FIRST_NAME(), TAuthor_LAST_NAME())

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

@ -3013,4 +3013,4 @@ public abstract class jOOQAbstractTest<
public void testStreamsCollectPOJOs() {
new StreamsTest(this).testStreamsCollectPOJOs();
}
}
}

25
jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
View File

@ -43,6 +43,7 @@ package org.jooq.impl;
import static java.util.Arrays.asList;
// ...
// ...
import static org.jooq.SQLDialect.SQLITE;
import static org.jooq.conf.ParamType.INDEXED;
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.conf.ParamType.NAMED;
@ -84,9 +85,10 @@ import org.jooq.tools.StringUtils;
*/
class DefaultRenderContext extends AbstractContext<RenderContext> implements RenderContext {
private static final JooqLogger log = JooqLogger.getLogger(DefaultRenderContext.class);
private static final JooqLogger log = JooqLogger.getLogger(DefaultRenderContext.class);
private static final Pattern NEWLINE = Pattern.compile("[\\n\\r]");
private static final Pattern IDENTIFIER_PATTERN = Pattern.compile("[A-Za-z][A-Za-z0-9_]*");
private static final Pattern NEWLINE = Pattern.compile("[\\n\\r]");
private static final Set<String> SQLITE_KEYWORDS;
private final StringBuilder sql;
@ -394,18 +396,21 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
// Quoting is needed when explicitly requested...
boolean needsQuote =
(QUOTED == cachedRenderNameStyle
// [#2367] ... but in SQLite, quoting "normal" literals is generally
// asking for trouble, as SQLite bends the rules here, see
// http://www.sqlite.org/lang_keywords.html for details ...
&& family != SQLDialect.SQLITE)
// [#2367] ... but in SQLite, quoting "normal" literals is generally
// asking for trouble, as SQLite bends the rules here, see
// http://www.sqlite.org/lang_keywords.html for details ...
(family != SQLITE && QUOTED == cachedRenderNameStyle)
||
// [#2367] ... yet, do quote when an identifier is a SQLite keyword
(family == SQLDialect.SQLITE
&& SQLITE_KEYWORDS.contains(literal.toUpperCase()));
// [#2367] ... yet, do quote when an identifier is a SQLite keyword
(family == SQLITE && SQLITE_KEYWORDS.contains(literal.toUpperCase()))
||
// [#1982] [#3360] ... yet, do quote when an identifier contains special characters
(family == SQLITE && !IDENTIFIER_PATTERN.matcher(literal).matches());
if (!needsQuote) {
if (LOWER == cachedRenderNameStyle) {