cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1053934 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: access/trans/QueryAssemblerHelper.java dba/hsqldb/HSQLDBAdapter.java
Date Thu, 30 Dec 2010 16:35:45 GMT
Author: oltka
Date: Thu Dec 30 16:35:44 2010
New Revision: 1053934

URL: http://svn.apache.org/viewvc?rev=1053934&view=rev
Log:
CAY-1506 fixed problem in HSQLDBAdapter (2 times added quotes); fixed problem with column
without quotes

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java?rev=1053934&r1=1053933&r2=1053934&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
Thu Dec 30 16:35:44 2010
@@ -285,9 +285,7 @@ public abstract class QueryAssemblerHelp
     }
 
     protected void processColumn(DbAttribute dbAttr) throws IOException {
-        String alias = (queryAssembler.supportsTableAliases()) ? queryAssembler
-                .getCurrentAlias() : null;
-        out.append(dbAttr.getAliasedName(alias));
+        processColumnWithQuoteSqlIdentifiers(dbAttr, null);
     }
 
     protected void processColumnWithQuoteSqlIdentifiers(DbAttribute dbAttr, Expression pathExp)

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java?rev=1053934&r1=1053933&r2=1053934&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
Thu Dec 30 16:35:44 2010
@@ -112,7 +112,7 @@ public class HSQLDBAdapter extends JdbcA
 
         StringBuilder buf = new StringBuilder();
 
-        buf.append("ALTER TABLE ").append(context.quoteString(srcName));
+        buf.append("ALTER TABLE ").append(srcName);
         buf.append(" ADD CONSTRAINT ");
 
         buf.append(context.quoteString(getSchemaName(source)));



Mime
View raw message