You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2008/01/13 22:36:23 UTC
svn commit: r611655 [4/11] - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished: .settings/
src/main/java/org/apache/cayenne/ src/main/java/org/apache/cayenne/access/
src/main/java/org/apache/cayenne/access/event/
src/main/java/org/apache/caye...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
*/
public class MySQLPkGenerator extends JdbcPkGenerator {
+ @Override
protected String dropAutoPkString() {
return "DROP TABLE IF EXISTS AUTO_PK_SUPPORT";
}
@@ -43,6 +44,7 @@
* Overrides superclass's implementation to perform locking of the primary key lookup
* table.
*/
+ @Override
protected int pkFromDatabase(DataNode node, DbEntity ent) throws Exception {
// must work directly with JDBC connection, since we
@@ -133,6 +135,7 @@
return parent;
}
+ @Override
protected String pkTableCreateString() {
StringBuffer buf = new StringBuffer();
buf.append("CREATE TABLE AUTO_PK_SUPPORT (").append(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
super(query, adapter, entityResolver);
}
+ @Override
public void performAction(Connection connection, OperationObserver observer)
throws SQLException, Exception {
@@ -122,6 +123,7 @@
* Creates a translator that adds parenthesis to no-param queries.
*/
// see CAY-750 for the problem description
+ @Override
protected ProcedureTranslator createTranslator(Connection connection) {
ProcedureTranslator translator = new MySQLProcedureTranslator();
translator.setAdapter(getAdapter());
@@ -134,6 +136,7 @@
// same as postgres translator - should we make this the default?
static class MySQLProcedureTranslator extends ProcedureTranslator {
+ @Override
protected String createSqlString() {
String sql = super.createSqlString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
*/
class MySQLSelectTranslator extends SelectTranslator {
+ @Override
public String createSqlString() throws Exception {
String sql = super.createSqlString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -39,9 +39,11 @@
super(adapter, resolver);
}
+ @Override
public SQLAction objectSelectAction(SelectQuery query) {
return new SelectAction(query, adapter, entityResolver) {
+ @Override
protected SelectTranslator createTranslator(Connection connection) {
SelectTranslator translator = new OpenBaseSelectTranslator();
translator.setQuery(query);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java Sun Jan 13 13:35:44 2008
@@ -70,11 +70,13 @@
*
* @since 1.2
*/
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new OpenBaseActionBuilder(this, node
.getEntityResolver()));
}
+ @Override
protected void configureExtendedTypes(ExtendedTypeMap map) {
super.configureExtendedTypes(map);
@@ -85,6 +87,7 @@
map.registerType(new OpenBaseCharType());
}
+ @Override
public DbAttribute buildAttribute(
String name,
String typeName,
@@ -105,6 +108,7 @@
/**
* Returns word "go".
*/
+ @Override
public String getBatchTerminator() {
return "go";
}
@@ -112,6 +116,7 @@
/**
* Returns null, since views are not yet supported in openbase.
*/
+ @Override
public String tableTypeForView() {
// TODO: according to OpenBase docs views *ARE* supported.
return null;
@@ -120,6 +125,7 @@
/**
* Returns OpenBase-specific translator for queries.
*/
+ @Override
public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
return new OpenBaseQualifierTranslator(queryAssembler);
}
@@ -129,6 +135,7 @@
* implementation to return an
* instance of OpenBasePkGenerator that uses built-in multi-server primary key generation.
*/
+ @Override
protected PkGenerator createPkGenerator() {
return new OpenBasePkGenerator();
}
@@ -137,6 +144,7 @@
* Returns a SQL string that can be used to create database table
* corresponding to <code>ent</code> parameter.
*/
+ @Override
public String createTable(DbEntity ent) {
StringBuffer buf = new StringBuffer();
@@ -216,6 +224,7 @@
* Returns a SQL string that can be used to create
* a foreign key constraint for the relationship.
*/
+ @Override
public String createFkConstraint(DbRelationship rel) {
StringBuffer buf = new StringBuffer();
@@ -268,6 +277,7 @@
super(Byte.class.getName());
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type)
throws Exception {
@@ -282,6 +292,7 @@
super(false, true);
}
+ @Override
public void setJdbcObject(
PreparedStatement st,
Object val,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java Sun Jan 13 13:35:44 2008
@@ -47,6 +47,7 @@
* mechanism is used, key caching is disabled. Instead a database operation is
* performed on every call.
*/
+ @Override
public Object generatePkForDbEntity(DataNode node, DbEntity entity) throws Exception {
// check for binary pk
Object binPK = binaryPK(entity);
@@ -66,6 +67,7 @@
*
* COLUMN must be marked as UNIQUE in order for this to work properly.
*/
+ @Override
protected int pkFromDatabase(DataNode node, DbEntity entity) throws Exception {
String sql = newIDString(entity);
QueryLogger.logQuery(sql, Collections.EMPTY_LIST);
@@ -116,6 +118,7 @@
return buf.toString();
}
+ @Override
public void createAutoPk(DataNode node, List dbEntities) throws Exception {
// looks like generating a PK on top of an existing one does not
// result in errors...
@@ -139,6 +142,7 @@
/**
*
*/
+ @Override
public List createAutoPkStatements(List dbEntities) {
List list = new ArrayList(2 * dbEntities.size());
Iterator it = dbEntities.iterator();
@@ -165,6 +169,7 @@
/**
*
*/
+ @Override
public void dropAutoPk(DataNode node, List dbEntities) throws Exception {
// there is no simple way to do that... probably requires
// editing metadata tables...
@@ -176,6 +181,7 @@
/**
* Returns an empty list, since OpenBase doesn't support this operation.
*/
+ @Override
public List dropAutoPkStatements(List dbEntities) {
return Collections.EMPTY_LIST;
}
@@ -244,6 +250,7 @@
return buffer.toString();
}
+ @Override
public void reset() {
// noop
}
@@ -252,10 +259,12 @@
* Returns zero, since PK caching is not feasible with OpenBase PK generation
* mechanism.
*/
+ @Override
public int getPkCacheSize() {
return 0;
}
+ @Override
public void setPkCacheSize(int pkCacheSize) {
// noop, no PK caching
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseQualifierTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseQualifierTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseQualifierTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseQualifierTranslator.java Sun Jan 13 13:35:44 2008
@@ -42,6 +42,7 @@
super(queryAssembler);
}
+ @Override
public void startNode(Expression node, Expression parentNode) {
if (node.getOperandCount() == 2) {
@@ -62,6 +63,7 @@
}
}
+ @Override
public void endNode(Expression node, Expression parentNode) {
if (node.getOperandCount() == 2) {
// check if we need to use objectMatchTranslator to finish building the expression
@@ -82,6 +84,7 @@
}
}
+ @Override
protected void appendLiteralDirect(
StringBuffer buf,
Object val,
@@ -117,6 +120,7 @@
return buffer.toString();
}
+ @Override
public void finishedChild(Expression node, int childIndex, boolean hasMoreChildren) {
if (!hasMoreChildren) {
return;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
*/
class OpenBaseSelectTranslator extends SelectTranslator {
+ @Override
public String createSqlString() throws Exception {
String sql = super.createSqlString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
super(adapter, resolver);
}
+ @Override
public SQLAction sqlAction(SQLTemplate query) {
return new Oracle8SQLTemplateAction(query, adapter);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java Sun Jan 13 13:35:44 2008
@@ -36,11 +36,13 @@
/**
* Uses OracleActionBuilder to create the right action.
*/
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new Oracle8ActionBuilder(this, node
.getEntityResolver()));
}
+ @Override
public URL findAdapterResource(String name) {
if("/types.xml".equals(name)) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java Sun Jan 13 13:35:44 2008
@@ -50,6 +50,7 @@
* common for selecting and updating statements that does not work in Oracle 8.*
* drivers.
*/
+ @Override
protected void execute(
Connection connection,
OperationObserver callback,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -38,10 +38,12 @@
super(adapter, resolver);
}
+ @Override
public SQLAction sqlAction(SQLTemplate query) {
return new OracleSQLTemplateAction(query, adapter);
}
+ @Override
public SQLAction batchAction(BatchQuery query) {
// special handling for LOB updates
@@ -65,10 +67,12 @@
}
+ @Override
public SQLAction procedureAction(ProcedureQuery query) {
return new OracleProcedureAction(query, getAdapter(), getEntityResolver());
}
+ @Override
public SQLAction objectSelectAction(SelectQuery query) {
return new OracleSelectAction(query, getAdapter(), getEntityResolver());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java Sun Jan 13 13:35:44 2008
@@ -177,6 +177,7 @@
/**
* @since 3.0
*/
+ @Override
protected EJBQLTranslatorFactory createEJBQLTranslatorFactory() {
return new OracleEJBQLTranslatorFactory();
}
@@ -185,6 +186,7 @@
* Installs appropriate ExtendedTypes as converters for passing values between JDBC
* and Java layers.
*/
+ @Override
protected void configureExtendedTypes(ExtendedTypeMap map) {
super.configureExtendedTypes(map);
@@ -214,6 +216,7 @@
* Creates and returns a primary key generator. Overrides superclass implementation to
* return an instance of OraclePkGenerator.
*/
+ @Override
protected PkGenerator createPkGenerator() {
return new OraclePkGenerator();
}
@@ -235,6 +238,7 @@
* Fixes some reverse engineering problems. Namely if a columns is created as DECIMAL
* and has non-positive precision it is converted to INTEGER.
*/
+ @Override
public DbAttribute buildAttribute(
String name,
String typeName,
@@ -281,6 +285,7 @@
/**
* Returns a trimming translator.
*/
+ @Override
public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
return new TrimmingQualifierTranslator(
queryAssembler,
@@ -292,6 +297,7 @@
*
* @since 1.2
*/
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new OracleActionBuilder(this, node
.getEntityResolver()));
@@ -306,6 +312,7 @@
super(Integer.class.getName());
}
+ @Override
public void setJdbcObject(
PreparedStatement st,
Object val,
@@ -331,6 +338,7 @@
super(Double.class.getName());
}
+ @Override
public void setJdbcObject(
PreparedStatement st,
Object val,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
super(batchQuery, adapter, entityResolver);
}
+ @Override
protected BatchQueryBuilder createBuilder() throws CayenneException {
// intercept super call to configure the builder...
BatchQueryBuilder builder = super.createBuilder();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java Sun Jan 13 13:35:44 2008
@@ -37,14 +37,17 @@
super(context);
}
+ @Override
public boolean visitPath(EJBQLExpression expression, int finishedChildIndex) {
expression.visit(new EJBQLPathTranslator(context) {
+ @Override
protected void appendMultiColumnPath(EJBQLMultiColumnOperand operand) {
OracleEJBQLConditionTranslator.this.addMultiColumnOperand(operand);
}
+ @Override
protected void processTerminatingAttribute(ObjAttribute attribute) {
if (attribute.getDbAttribute().getType() == Types.CHAR) {
context.append(' ').append(OracleAdapter.TRIM_FUNCTION).append("(");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java Sun Jan 13 13:35:44 2008
@@ -28,6 +28,7 @@
*/
class OracleEJBQLTranslatorFactory extends JdbcEJBQLTranslatorFactory {
+ @Override
public EJBQLExpressionVisitor getConditionTranslator(EJBQLTranslationContext context) {
return new OracleEJBQLConditionTranslator(context);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java Sun Jan 13 13:35:44 2008
@@ -57,6 +57,7 @@
private static final String _SEQUENCE_PREFIX = "pk_";
+ @Override
public void createAutoPk(DataNode node, List dbEntities) throws Exception {
List sequences = getExistingSequences(node);
@@ -70,6 +71,7 @@
}
}
+ @Override
public List createAutoPkStatements(List dbEntities) {
List list = new ArrayList();
Iterator it = dbEntities.iterator();
@@ -81,6 +83,7 @@
return list;
}
+ @Override
public void dropAutoPk(DataNode node, List dbEntities) throws Exception {
List sequences = getExistingSequences(node);
@@ -94,6 +97,7 @@
}
}
+ @Override
public List dropAutoPkStatements(List dbEntities) {
List list = new ArrayList();
Iterator it = dbEntities.iterator();
@@ -134,6 +138,7 @@
* SELECT pk_table_name.nextval FROM DUAL
* </pre>
*/
+ @Override
protected int pkFromDatabase(DataNode node, DbEntity ent) throws Exception {
DbKeyGenerator pkGenerator = ent.getPrimaryKeyGenerator();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java Sun Jan 13 13:35:44 2008
@@ -52,6 +52,7 @@
/**
* Helper method that reads OUT parameters of a CallableStatement.
*/
+ @Override
protected void readProcedureOutParameters(
CallableStatement statement,
OperationObserver delegate) throws SQLException, Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java Sun Jan 13 13:35:44 2008
@@ -55,6 +55,7 @@
super(query, adapter);
}
+ @Override
protected void processSelectResult(
SQLStatement compiled,
Connection connection,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
super(query, adapter, entityResolver);
}
+ @Override
protected SelectTranslator createTranslator(Connection connection) {
SelectTranslator translator = new OracleSelectTranslator();
translator.setQuery(query);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
Integer.valueOf(100)
};
+ @Override
public String createSqlString() throws Exception {
String sqlString = super.createSqlString();
@@ -94,6 +95,7 @@
* Translates internal query into PreparedStatement, applying Oracle optimizations if
* possible.
*/
+ @Override
public PreparedStatement createStatement() throws Exception {
String sqlStr = createSqlString();
QueryLogger.logQuery(sqlStr, values);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java Sun Jan 13 13:35:44 2008
@@ -32,7 +32,8 @@
*/
public class OracleUtilDateType extends UtilDateType {
- public Object materializeObject(CallableStatement cs, int index, int type)
+ @Override
+ public Object materializeObject(CallableStatement cs, int index, int type)
throws Exception {
Object date = super.materializeObject(cs, index, type);
@@ -43,7 +44,8 @@
}
}
- public Object materializeObject(ResultSet rs, int index, int type)
+ @Override
+ public Object materializeObject(ResultSet rs, int index, int type)
throws Exception {
Object date = super.materializeObject(rs, index, type);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -40,13 +40,16 @@
super(adapter, resolver);
}
+ @Override
public SQLAction procedureAction(ProcedureQuery query) {
return new PostgresProcedureAction(query, getAdapter(), getEntityResolver());
}
+ @Override
public SQLAction objectSelectAction(SelectQuery query) {
return new SelectAction(query, adapter, entityResolver) {
+ @Override
protected SelectTranslator createTranslator(Connection connection) {
SelectTranslator translator = new PostgresSelectTranslator();
translator.setQuery(query);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java Sun Jan 13 13:35:44 2008
@@ -68,6 +68,7 @@
*
* @since 1.2
*/
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new PostgresActionBuilder(this, node
.getEntityResolver()));
@@ -77,6 +78,7 @@
* Installs appropriate ExtendedTypes as converters for passing values between JDBC
* and Java layers.
*/
+ @Override
protected void configureExtendedTypes(ExtendedTypeMap map) {
super.configureExtendedTypes(map);
@@ -85,6 +87,7 @@
map.registerType(new PostgresByteArrayType(true, true));
}
+ @Override
public DbAttribute buildAttribute(
String name,
String typeName,
@@ -118,6 +121,7 @@
*
* @since 1.0.2
*/
+ @Override
public String createTable(DbEntity ent) {
StringBuffer buf = new StringBuffer();
@@ -237,6 +241,7 @@
/**
* Returns a trimming translator.
*/
+ @Override
public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
return new PostgresQualifierTranslator(queryAssembler);
}
@@ -244,10 +249,12 @@
/**
* @see JdbcAdapter#createPkGenerator()
*/
+ @Override
protected PkGenerator createPkGenerator() {
return new PostgresPkGenerator();
}
+ @Override
public MergerFactory mergerFactory() {
return new PostgresMergerFactory();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresByteArrayType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresByteArrayType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresByteArrayType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresByteArrayType.java Sun Jan 13 13:35:44 2008
@@ -37,6 +37,7 @@
super(trimmingBytes, usingBlobs);
}
+ @Override
public void setJdbcObject(
PreparedStatement st,
Object val,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java Sun Jan 13 13:35:44 2008
@@ -39,6 +39,7 @@
*/
public class PostgresPkGenerator extends OraclePkGenerator {
+ @Override
protected String createSequenceString(DbEntity ent) {
// note that PostgreSQL 7.4 and newer supports INCREMENT BY and START WITH
// however 7.3 doesn't like BY and WITH, so using older more neutral syntax
@@ -61,6 +62,7 @@
* SELECT nextval(pk_table_name)
* </pre>
*/
+ @Override
protected int pkFromDatabase(DataNode node, DbEntity ent) throws Exception {
DbKeyGenerator pkGenerator = ent.getPrimaryKeyGenerator();
@@ -103,6 +105,7 @@
/**
* Fetches a list of existing sequences that might match Cayenne generated ones.
*/
+ @Override
protected List<String> getExistingSequences(DataNode node) throws SQLException {
// check existing sequences
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresProcedureAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresProcedureAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresProcedureAction.java Sun Jan 13 13:35:44 2008
@@ -47,6 +47,7 @@
* Creates a translator that adds parenthesis to no-param queries.
*/
// see CAY-750 for the problem description
+ @Override
protected ProcedureTranslator createTranslator(Connection connection) {
ProcedureTranslator translator = new PostgresProcedureTranslator();
translator.setAdapter(getAdapter());
@@ -58,6 +59,7 @@
static class PostgresProcedureTranslator extends ProcedureTranslator {
+ @Override
protected String createSqlString() {
String sql = super.createSqlString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresQualifierTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresQualifierTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresQualifierTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresQualifierTranslator.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
super(queryAssembler, "RTRIM");
}
+ @Override
public void startNode(Expression node, Expression parentNode) {
if (node.getOperandCount() == 2) {
@@ -55,6 +56,7 @@
}
}
+ @Override
public void endNode(Expression node, Expression parentNode) {
if (node.getOperandCount() == 2) {
// check if we need to use objectMatchTranslator to finish building the expression
@@ -75,6 +77,7 @@
}
}
+ @Override
public void finishedChild(Expression node, int childIndex, boolean hasMoreChildren) {
if (!hasMoreChildren) {
return;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
*/
class PostgresSelectTranslator extends SelectTranslator {
+ @Override
public String createSqlString() throws Exception {
String sql = super.createSqlString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
super(adapter, resolver);
}
+ @Override
public SQLAction sqlAction(SQLTemplate query) {
return new SQLiteSQLTemplateAction(query, adapter);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java Sun Jan 13 13:35:44 2008
@@ -46,6 +46,7 @@
this.setSupportsGeneratedKeys(false);
}
+ @Override
protected void configureExtendedTypes(ExtendedTypeMap map) {
super.configureExtendedTypes(map);
map.registerType(new SQLiteDateType());
@@ -57,10 +58,12 @@
map.registerType(new SQLiteCalendarType(Calendar.class));
}
+ @Override
public String createFkConstraint(DbRelationship rel) {
return null;
}
+ @Override
public String createUniqueConstraint(DbEntity source, Collection columns) {
// TODO: andrus 10/9/2007 - only ALTER TABLE ADD CONSTRAINT is not supported,
// presumably there's some other syntax (a part of CREATE TABLE?) that would
@@ -68,6 +71,7 @@
return null;
}
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new SQLiteActionBuilder(this, node
.getEntityResolver()));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
*/
class SQLiteBigDecimalType extends AbstractType {
+ @Override
public String getClassName() {
return BigDecimal.class.getName();
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
// BigDecimals are not supported by the zentus driver... in addition the driver
@@ -43,6 +45,7 @@
return (string == null) ? null : new BigDecimal(string);
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
// BigDecimals are not supported by the zentus driver... in addition the driver
// throws an NPE on 'getDouble' if the value is null, and also there are rounding
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
*/
class SQLiteByteArrayType extends AbstractType {
+ @Override
public String getClassName() {
return "byte[]";
}
+ @Override
public void setJdbcObject(
PreparedStatement st,
Object val,
@@ -49,10 +51,12 @@
}
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
return rs.getBytes(index);
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
return rs.getBytes(index);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteDateType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteDateType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteDateType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteDateType.java Sun Jan 13 13:35:44 2008
@@ -50,6 +50,7 @@
timeFormat = new SimpleDateFormat("kk:mm:ss");
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
String string = rs.getString(index);
@@ -75,6 +76,7 @@
}
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java Sun Jan 13 13:35:44 2008
@@ -29,10 +29,12 @@
*/
class SQLiteFloatType extends AbstractType {
+ @Override
public String getClassName() {
return Float.class.getName();
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
// the driver throws an NPE on 'getFloat' if the value is null, so must read it as
@@ -41,6 +43,7 @@
return (n == null) ? null : new Float(n.floatValue());
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
// the driver throws an NPE on 'getFloat' if the value is null, so must read it as
// an object.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteObjectType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteObjectType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteObjectType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteObjectType.java Sun Jan 13 13:35:44 2008
@@ -34,15 +34,18 @@
*/
class SQLiteObjectType extends AbstractType {
+ @Override
public String getClassName() {
return Object.class.getName();
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
return rs.getObject(index);
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
return rs.getObject(index);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java Sun Jan 13 13:35:44 2008
@@ -46,6 +46,7 @@
* execute it appropriately. Super implementation relied on generic JDBC mechanism,
* common for selecting and updating statements that does not work in SQLite drivers.
*/
+ @Override
protected void execute(
Connection connection,
OperationObserver callback,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java Sun Jan 13 13:35:44 2008
@@ -37,6 +37,7 @@
super(adapter, resolver);
}
+ @Override
public SQLAction batchAction(BatchQuery query) {
// check run strategy...
@@ -49,6 +50,7 @@
return action;
}
+ @Override
public SQLAction procedureAction(ProcedureQuery query) {
return new SQLServerProcedureAction(query, getAdapter(), getEntityResolver());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java Sun Jan 13 13:35:44 2008
@@ -92,6 +92,7 @@
*
* @since 1.2
*/
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return query.createSQLAction(new SQLServerActionBuilder(this, node.getEntityResolver()));
}
@@ -100,6 +101,7 @@
/**
* Returns a trimming translator.
*/
+ @Override
public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
return new TrimmingQualifierTranslator(
queryAssembler,
@@ -112,6 +114,7 @@
*
* @since 1.2
*/
+ @Override
protected void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute column) {
super.createTableAppendColumn(sqlBuffer, column);
@@ -121,6 +124,7 @@
}
}
+ @Override
public MergerFactory mergerFactory() {
return new SQLServerMergerFactory();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerBatchAction.java Sun Jan 13 13:35:44 2008
@@ -45,6 +45,7 @@
super(batchQuery, adapter, entityResolver);
}
+ @Override
public void performAction(Connection connection, OperationObserver observer)
throws SQLException, Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java Sun Jan 13 13:35:44 2008
@@ -56,6 +56,7 @@
super(query, adapter, entityResolver);
}
+ @Override
public void performAction(Connection connection, OperationObserver observer)
throws SQLException, Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
*
* @since 1.0.4
*/
+ @Override
public String getBatchTerminator() {
return "go";
}
@@ -51,6 +52,7 @@
* Installs appropriate ExtendedTypes as converters for passing values
* between JDBC and Java layers.
*/
+ @Override
protected void configureExtendedTypes(ExtendedTypeMap map) {
super.configureExtendedTypes(map);
@@ -70,10 +72,12 @@
* Overrides superclass implementation to return an
* instance of SybasePkGenerator.
*/
+ @Override
protected PkGenerator createPkGenerator() {
return new SybasePkGenerator();
}
+ @Override
public void bindParameter(
PreparedStatement statement,
Object object,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java Sun Jan 13 13:35:44 2008
@@ -78,6 +78,7 @@
*
* @param node node that provides access to a DataSource.
*/
+ @Override
public void createAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
super.createAutoPk(node, dbEntities);
super.runUpdate(node, safePkProcDrop());
@@ -85,6 +86,7 @@
}
+ @Override
public List<String> createAutoPkStatements(List<DbEntity> dbEntities) {
List<String> list = super.createAutoPkStatements(dbEntities);
@@ -118,11 +120,13 @@
*
* @param node node that provides access to a DataSource.
*/
+ @Override
public void dropAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
super.runUpdate(node, safePkProcDrop());
super.runUpdate(node, safePkTableDrop());
}
+ @Override
public List<String> dropAutoPkStatements(List<DbEntity> dbEntities) {
List<String> list = new ArrayList<String>();
list.add(safePkProcDrop());
@@ -130,6 +134,7 @@
return list;
}
+ @Override
protected int pkFromDatabase(DataNode node, DbEntity ent) throws Exception {
// handle CAY-588 - get connection that is separate from the connection in the
// current transaction.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java Sun Jan 13 13:35:44 2008
@@ -136,46 +136,55 @@
class CompilationVisitor extends EJBQLBaseVisitor {
+ @Override
public boolean visitSelect(EJBQLExpression expression) {
appendingResultColumns = true;
return true;
}
+ @Override
public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {
appendingResultColumns = false;
return true;
}
+ @Override
public boolean visitSelectExpression(EJBQLExpression expression) {
expression.visit(rootDescriptorVisitor);
return false;
}
+ @Override
public boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex) {
expression.visit(fromItemVisitor);
return false;
}
+ @Override
public boolean visitInnerFetchJoin(EJBQLJoin join) {
join.visit(joinVisitor);
return false;
}
+ @Override
public boolean visitInnerJoin(EJBQLJoin join) {
join.visit(joinVisitor);
return false;
}
+ @Override
public boolean visitOuterFetchJoin(EJBQLJoin join) {
join.visit(joinVisitor);
return false;
}
+ @Override
public boolean visitOuterJoin(EJBQLJoin join) {
join.visit(joinVisitor);
return false;
}
+ @Override
public boolean visitWhere(EJBQLExpression expression) {
expression.visit(pathVisitor);
@@ -184,11 +193,13 @@
return true;
}
+ @Override
public boolean visitOrderBy(EJBQLExpression expression) {
expression.visit(pathVisitor);
return false;
}
+ @Override
public boolean visitSubselect(EJBQLExpression expression) {
return super.visitSubselect(expression);
}
@@ -198,6 +209,7 @@
private String entityName;
+ @Override
public boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex) {
if (finishedChildIndex + 1 == expression.getChildrenCount()) {
@@ -233,6 +245,7 @@
return true;
}
+ @Override
public boolean visitIdentificationVariable(EJBQLExpression expression) {
entityName = expression.getText();
return true;
@@ -245,6 +258,7 @@
private ObjRelationship incoming;
private ClassDescriptor descriptor;
+ @Override
public boolean visitPath(EJBQLExpression expression, int finishedChildIndex) {
if (finishedChildIndex + 1 < expression.getChildrenCount()) {
this.id = ((EJBQLPath) expression).getId();
@@ -258,6 +272,7 @@
return true;
}
+ @Override
public boolean visitIdentificationVariable(EJBQLExpression expression) {
Property property = descriptor.getProperty(expression.getText());
if (property instanceof ArcProperty) {
@@ -272,6 +287,7 @@
return true;
}
+ @Override
public boolean visitIdentifier(EJBQLExpression expression) {
if (incoming != null) {
@@ -300,6 +316,7 @@
class PathVisitor extends EJBQLBaseVisitor {
+ @Override
public boolean visitPath(EJBQLExpression expression, int finishedChildIndex) {
addPath((EJBQLPath) expression);
return false;
@@ -308,16 +325,19 @@
class SelectExpressionVisitor extends EJBQLBaseVisitor {
+ @Override
public boolean visitIdentifier(EJBQLExpression expression) {
rootId = normalizeIdPath(expression.getText());
return false;
}
+ @Override
public boolean visitAggregate(EJBQLExpression expression) {
addResultSetColumn();
return false;
}
+ @Override
public boolean visitPath(EJBQLExpression expression, int finishedChildIndex) {
addPath((EJBQLPath) expression);
addResultSetColumn();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbs.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbs.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbs.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbs.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAbs(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitAbs(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbstractSchemaName.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbstractSchemaName.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbstractSchemaName.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAbstractSchemaName.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAbstractSchemaName(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAdd.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAdd.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAdd.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAdd.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAdd(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitAdd(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAggregate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAggregate.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAggregate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAggregate.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAggregate(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAll.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAll.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAll.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAll.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAll(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAnd.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAnd.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAnd.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAnd.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAnd(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitAnd(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAny.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAny.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAny.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAny.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAny(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAscending.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAscending.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAscending.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAscending.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAscending(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAverage.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAverage.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAverage.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLAverage.java Sun Jan 13 13:35:44 2008
@@ -30,14 +30,17 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitAverage(this);
}
+ @Override
public String getFunction() {
return "AVG";
}
+ @Override
public String getJavaType(String pathType) {
return "java.lang.Double";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBetween.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBetween.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBetween.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBetween.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitBetween(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitBetween(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBooleanLiteral.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBooleanLiteral.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBooleanLiteral.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLBooleanLiteral.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitBooleanLiteral(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLClassName.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLClassName.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLClassName.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLClassName.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitClassName(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConcat.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConcat.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConcat.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConcat.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitConcat(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitConcat(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructor.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructor.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitConstructor(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameter.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitConstructorParameter(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameters.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameters.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameters.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLConstructorParameters.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitConstructorParameters(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCount.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCount.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCount.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCount.java Sun Jan 13 13:35:44 2008
@@ -30,14 +30,17 @@
super(id);
}
+ @Override
public String getFunction() {
return "COUNT";
}
+ @Override
public String getJavaType(String pathType) {
return "java.lang.Long";
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitCount(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentDate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentDate.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentDate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentDate.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitCurrentDate(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTime.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTime.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTime.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitCurrentTime(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTimestamp.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTimestamp.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTimestamp.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLCurrentTimestamp.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitCurrentTimestamp(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDecimalLiteral.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDecimalLiteral.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDecimalLiteral.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDecimalLiteral.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitDecimalLiteral(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDelete.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDelete.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDelete.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDelete.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitDelete(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDescending.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDescending.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDescending.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDescending.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitDescending(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDistinct.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDistinct.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDistinct.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDistinct.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitDistinct(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDivide.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDivide.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDivide.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLDivide.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitDivide(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitDivide(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEquals.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEquals.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEquals.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEquals.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitEquals(this, -1);
}
+ @Override
protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
return super.visitChild(visitor, childIndex)
&& visitor.visitEquals(this, childIndex);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEscapeCharacter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEscapeCharacter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEscapeCharacter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLEscapeCharacter.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
super(id);
}
+ @Override
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
return visitor.visitEscapeCharacter(this);
}