You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/10/21 21:33:21 UTC
svn commit: r586943 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne:
access/jdbc/ dba/mysql/
Author: aadamchik
Date: Sun Oct 21 12:33:21 2007
New Revision: 586943
URL: http://svn.apache.org/viewvc?rev=586943&view=rev
Log:
making alias-free delete syntax the default for all drivers
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLDeleteFromTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLDeleteTranslator.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java?rev=586943&r1=586942&r2=586943&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java Sun Oct 21 12:33:21 2007
@@ -148,11 +148,19 @@
ClassDescriptor descriptor = context.getEntityDescriptor(id);
String tableName = descriptor.getEntity().getDbEntity().getFullyQualifiedName();
- String alias = context.getTableAlias(id, tableName);
- // not using "AS" to separate table name and alias name - OpenBase doesn't support
- // "AS", and the rest of the databases do not care
- context.append(' ').append(tableName).append(' ').append(alias);
- return alias;
+ if (context.isUsingAliases()) {
+ String alias = context.getTableAlias(id, tableName);
+
+ // not using "AS" to separate table name and alias name - OpenBase doesn't
+ // support
+ // "AS", and the rest of the databases do not care
+ context.append(' ').append(tableName).append(' ').append(alias);
+ return alias;
+ }
+ else {
+ context.append(' ').append(tableName);
+ return tableName;
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java?rev=586943&r1=586942&r2=586943&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java Sun Oct 21 12:33:21 2007
@@ -29,6 +29,7 @@
public class JdbcEJBQLTranslatorFactory implements EJBQLTranslatorFactory {
public EJBQLExpressionVisitor getDeleteTranslator(EJBQLTranslationContext context) {
+ context.setUsingAliases(false);
return new EJBQLDeleteTranslator(context);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java?rev=586943&r1=586942&r2=586943&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java Sun Oct 21 12:33:21 2007
@@ -31,9 +31,4 @@
public EJBQLExpressionVisitor getConditionTranslator(EJBQLTranslationContext context) {
return new MySQLEJBQLConditionTranslator(context);
}
-
- public EJBQLExpressionVisitor getDeleteTranslator(EJBQLTranslationContext context) {
- context.setUsingAliases(false);
- return new MySQLEJBQLDeleteTranslator(context);
- }
}