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/06/11 14:38:06 UTC
svn commit: r546127 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc:
EJBQLFromTranslator.java EJBQLPathTranslator.java
EJBQLSelectColumnsTranslator.java EJBQLTranslationContext.java
Author: aadamchik
Date: Mon Jun 11 05:38:04 2007
New Revision: 546127
URL: http://svn.apache.org/viewvc?view=rev&rev=546127
Log:
refactoring - createAlias -> getAlias
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/EJBQLPathTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.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?view=diff&rev=546127&r1=546126&r2=546127
==============================================================================
--- 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 Mon Jun 11 05:38:04 2007
@@ -30,7 +30,8 @@
import org.apache.cayenne.reflect.ClassDescriptor;
public class EJBQLFromTranslator extends EJBQLBaseVisitor {
-
+
+
private EJBQLTranslationContext context;
private String lastTableAlias;
@@ -133,7 +134,7 @@
id);
String tableName = descriptor.getEntity().getDbEntity().getFullyQualifiedName();
- String alias = context.createAlias(id, tableName);
+ String alias = context.getAlias(id, tableName);
context.append(' ').append(tableName).append(" AS ").append(alias);
return alias;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java?view=diff&rev=546127&r1=546126&r2=546127
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java Mon Jun 11 05:38:04 2007
@@ -96,7 +96,7 @@
.getAttribute(lastPathComponent);
DbEntity table = currentEntity.getDbEntity();
- String alias = context.createAlias(idPath, table.getFullyQualifiedName());
+ String alias = context.getAlias(idPath, table.getFullyQualifiedName());
context.append(' ').append(alias).append('.').append(
attribute.getDbAttributeName());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java?view=diff&rev=546127&r1=546126&r2=546127
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java Mon Jun 11 05:38:04 2007
@@ -129,7 +129,7 @@
private void appendColumn(String identifier, DbAttribute column, String javaType) {
DbEntity table = (DbEntity) column.getEntity();
- String alias = context.createAlias(identifier, table.getFullyQualifiedName());
+ String alias = context.getAlias(identifier, table.getFullyQualifiedName());
String columnName = alias + "." + column.getName();
Set columns = getColumns();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java?view=diff&rev=546127&r1=546126&r2=546127
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java Mon Jun 11 05:38:04 2007
@@ -117,7 +117,7 @@
* Retrieves a SQL alias for the combination of EJBQL id variable and a table name. If
* such alias hasn't been used, it is created on the fly.
*/
- String createAlias(String idPath, String tableName) {
+ String getAlias(String idPath, String tableName) {
StringBuffer keyBuffer = new StringBuffer();