Author: tfischer
Date: Tue May 8 12:35:24 2012
New Revision: 1335473
URL: http://svn.apache.org/viewvc?rev=1335473&view=rev
Log:
- simplify code
- improved javadoc
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Column.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Column.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Column.java?rev=1335473&r1=1335472&r2=1335473&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Column.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Column.java
Tue May 8 12:35:24 2012
@@ -27,7 +27,7 @@ package org.apache.torque;
public interface Column
{
/**
- * Returns the name of the column (not prefixed by the table name).
+ * Returns the name of the database column (not prefixed by the table
name).
*
* @return the name of the column, may be null.
* (e.g. for the pseudocoulumn count(*)).
@@ -62,7 +62,7 @@ public interface Column
String getFullTableName();
/**
- * Returns the SQL expression for the column name qualified by the
+ * Returns the SQL expression for the column, qualified by the
* table name but not by the schema name.
* This can also be a pseudocolumn (e.g. count(*)).
*
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java?rev=1335473&r1=1335472&r2=1335473&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
Tue May 8 12:35:24 2012
@@ -27,7 +27,7 @@ import org.apache.commons.lang.builder.H
/**
* An implementation of the column interface.
- * This class is immutable, i.e cannot be cchanged once constructed.
+ * This class is immutable, i.e cannot be changed once constructed.
*
* @version $Id$
*/
@@ -118,7 +118,7 @@ public class ColumnImpl implements Colum
* @param schemaName the schema name, may be null but not blank.
* @param tableName the table name, may be null but not blank.
* If it contains a dot, then only the portion after the dot
- * will be taken as stable name.
+ * will be taken as table name.
* If it contains a dot and schemaName is null, then the schema
* name will be set as the portion before the dot.
* @param columnName the column name, may be null but not blank.
@@ -162,7 +162,6 @@ public class ColumnImpl implements Colum
{
if (StringUtils.contains(sqlExpression, "*"))
{
- setColumnName("*");
return;
}
if (StringUtils.indexOfAny(sqlExpression, FUNCTION_DELIMITERS)
@@ -285,6 +284,9 @@ public class ColumnImpl implements Colum
/**
* Sets the table name.
+ * If a table name with schema prefix is passed, then the unqualified table
+ * name is used as table name and the schema name will be set to the
+ * extracted schema name.
*
* @param tableName the table name, not blank, may be null.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
