git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@901 f203690c-595d-4dc9-a70b-905162fa7fd2tags/jackcess-2.0.8
@@ -94,6 +94,12 @@ | |||
<role>Contributed to cookbook.</role> | |||
</roles> | |||
</contributor> | |||
<contributor> | |||
<name>Gabriele Favalessa</name> | |||
<roles> | |||
<role>Fixed various query generation issues.</role> | |||
</roles> | |||
</contributor> | |||
</contributors> | |||
<issueManagement> | |||
<system>SourceForge2</system> |
@@ -11,6 +11,9 @@ | |||
<action dev="jahlborn" type="fix" system="SourceForge2Patches" issue="17"> | |||
Fix table name quoting for append and make table queries. | |||
</action> | |||
<action dev="jahlborn" type="fix" system="SourceForge2Patches" issue="18"> | |||
Don't double quote already quoted identifiers. | |||
</action> | |||
</release> | |||
<release version="2.0.7" date="2014-11-22"> | |||
<action dev="jahlborn" type="fix" system="SourceForge2" issue="111"> |
@@ -510,7 +510,14 @@ public abstract class QueryImpl implements Query | |||
protected static StringBuilder toQuotedExpr(StringBuilder builder, | |||
String expr) | |||
{ | |||
return builder.append('[').append(expr).append(']'); | |||
return (!isQuoted(expr) ? | |||
builder.append('[').append(expr).append(']') : | |||
builder.append(expr)); | |||
} | |||
protected static boolean isQuoted(String expr) { | |||
return ((expr.length() >= 2) && | |||
(expr.charAt(0) == '[') && (expr.charAt(expr.length() - 1) == ']')); | |||
} | |||
protected static StringBuilder toRemoteDb(StringBuilder builder, |
@@ -224,7 +224,7 @@ public class QueryTest extends TestCase | |||
"UpdateQuery",multiline( | |||
"PARAMETERS User Name Text;", | |||
"UPDATE Table1", | |||
"SET Table1.col1 = \"foo\", Table1.col2 = [Table2].[col3], [[Table2]].[[col1]] = [User Name]", | |||
"SET Table1.col1 = \"foo\", Table1.col2 = [Table2].[col3], [Table2].[col1] = [User Name]", | |||
"WHERE ((([Table2].[col1]) Is Not Null));")); | |||
expectedQueries.put( | |||
"MakeTableQuery",multiline( |