[hibernate-commits] Hibernate SVN: r16367 - in core/branches/antlr3/src: main/java/org/hibernate/sql/ast/common and 7 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Mon Apr 20 18:26:31 EDT 2009
Author: steve.ebersole at jboss.com
Date: 2009-04-20 18:26:31 -0400 (Mon, 20 Apr 2009)
New Revision: 16367
Added:
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpace.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpaceContext.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterTableExpressionGenerator.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PropertyPathTerminus.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/ResolutionContext.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathResolutionStrategy.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathedPropertyReferenceSource.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/TreePrinter.java
Removed:
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTAppender.java
Modified:
core/branches/antlr3/src/main/java/org/hibernate/loader/CollectionAliases.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/common/HibernateTree.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTPrinter.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/DisplayableNode.java
core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/NodeTraverser.java
core/branches/antlr3/src/test/java/org/hibernate/sql/TemplateTest.java
Log:
tree package
Modified: core/branches/antlr3/src/main/java/org/hibernate/loader/CollectionAliases.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/loader/CollectionAliases.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/loader/CollectionAliases.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -25,46 +25,53 @@
package org.hibernate.loader;
/**
- * Type definition of CollectionAliases.
+ * Defines the column names/aliases we can use to read selected values correlating to various part of a collection from
+ * the result set. For example, {@link #getSuffixedKeyAliases()} identifies the column/alias which represent the
+ * values for the collection key (the values mapped using <key/> in the metadata).
*
* @author Steve Ebersole
*/
public interface CollectionAliases {
/**
- * Returns the suffixed result-set column-aliases for columns making
- * up the key for this collection (i.e., its FK to its owner).
+ * Retrieve the aliases to the collection key values (i.e., the <tt>FK</tt> to its owner).
*
- * @return The key result-set column aliases.
+ * @return The collection key result-set column aliases.
*/
public String[] getSuffixedKeyAliases();
/**
- * Returns the suffixed result-set column-aliases for the collumns
- * making up the collection's index (map or list).
+ * Retrieve the aliases to the "collection identifer", which is the PK of the entity which owns this collection.
+ * Can be different from {@link #getSuffixedKeyAliases()} in the case of <property-ref/>, though usually these
+ * will be the same values.
*
- * @return The index result-set column aliases.
+ * @return The collection identifier result-set column aliases.
*/
- public String[] getSuffixedIndexAliases();
+ public String getSuffixedIdentifierAlias();
/**
- * Returns the suffixed result-set column-aliases for the columns
- * making up the collection's elements.
+ * Retrieve the aliases to the collection index values (pertinent only for indexed collections like
+ * {@link java.util.Map} and {@link java.util.List}).
*
- * @return The element result-set column aliases.
+ * @return The collection index result-set column aliases.
*/
- public String[] getSuffixedElementAliases();
+ public String[] getSuffixedIndexAliases();
/**
- * Returns the suffixed result-set column-aliases for the column
- * defining the collection's identifier (if any).
+ * Retrieve the aliases to the values defining the collection values. The "values" of a collection of different
+ * depending on the type of elements defined in the metadata (is it a value colletion or an entity collection)<ul>
+ * <li><b><elements></b> - represents a colletion of values (e.g. Strings); the aliases here would represent
+ * the columns making up the element values</li>
+ * <li><b><one-to-many></b> - ???</li>
+ * <li><b><many-to-many></b> - the aliases here would represent the values from the association table which
+ * map to the related element entity's; normally this would be the same as the element entity's PK value but could
+ * be different in the case of a <property-ref/>.
*
- * @return The identifier result-set column aliases.
+ * @return The collection element result-set column aliases.
*/
- public String getSuffixedIdentifierAlias();
+ public String[] getSuffixedElementAliases();
/**
- * Returns the suffix used to unique the column aliases for this
- * particular alias set.
+ * Returns the suffix used to unique the column aliases for this particular alias set.
*
* @return The uniqued column alias suffix.
*/
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/common/HibernateTree.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/common/HibernateTree.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/common/HibernateTree.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -61,6 +61,10 @@
this( new HibernateToken( type, text ) );
}
+ public HibernateTree(int type) {
+ this( new HibernateToken( type ) );
+ }
+
public Tree dupNode() {
return new HibernateTree( this );
}
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/ordering/OrderByFragmentTranslator.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -30,11 +30,12 @@
import org.slf4j.LoggerFactory;
import org.hibernate.HibernateException;
-import org.hibernate.sql.ast.util.ASTPrinter;
+import org.hibernate.sql.ast.util.TreePrinter;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.tree.Tree;
/**
* A translator which coordinates translation of an <tt>order-by</tt> mapping.
@@ -61,7 +62,12 @@
OrderByParserLexer lexer = new OrderByParserLexer( new ANTLRStringStream( fragment ) );
OrderByFragmentParser parser = new OrderByFragmentParser( new CommonTokenStream( lexer ), context );
try {
- parser.orderByFragment();
+ Tree tree = ( Tree ) parser.orderByFragment().getTree();
+
+ if ( log.isTraceEnabled() ) {
+ TreePrinter printer = new TreePrinter( OrderByParserParser.class );
+ log.trace( printer.renderAsString( tree, "--- {order-by fragment} ---" ) );
+ }
}
catch ( HibernateException e ) {
throw e;
@@ -70,11 +76,6 @@
throw new HibernateException( "Unable to parse order-by fragment", t );
}
-// if ( log.isTraceEnabled() ) {
-// ASTPrinter printer = new ASTPrinter( OrderByParserParser.class );
-// log.trace( printer.showAsString( parser..getAST(), "--- {order-by fragment} ---" ) );
-// }
-//
// OrderByFragmentRenderer renderer = new OrderByFragmentRenderer();
// try {
// renderer.orderByFragment( parser.getAST() );
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpace.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpace.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpace.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,46 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.sql.ast.phase.hql.resolve;
+
+import java.util.List;
+
+import org.antlr.runtime.tree.Tree;
+
+import org.hibernate.type.Type;
+
+/**
+ *
+ * @author Steve Ebersole
+ */
+public interface PersisterSpace {
+ public String getAlias();
+ public List<Tree> getTables();
+
+ public Type getPropertyType(String propertyName);
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpaceContext.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpaceContext.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterSpaceContext.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,77 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve;
+
+/**
+ * todo : javadocs
+ *
+ * @author Steve Ebersole
+ */
+public interface PersisterSpaceContext {
+ /**
+ * Does the given text represent an alias for a persister within this context?
+ *
+ * @param text The potential persister alias.
+ * @return True if given text is a persister alias; false otherwise.
+ */
+ public boolean isContainedAlias(String text);
+
+ /**
+ * Does the given text represent a property exposed from a persister in this context?
+ *
+ * @param text The potential property name.
+ * @return True if a persister in this context exposes such a property; false otherwise.
+ */
+ public boolean isContainedExposedProperty(String text);
+
+ /**
+ * Locate a {@link PersisterSpace} by alias.
+ *
+ * @param alias The alias by which to locate the persister space.
+ * @return The persister reference, or null.
+ */
+ public PersisterSpace locatePersisterSpaceByAlias(String alias);
+
+ /**
+ * Locate a {@link PersisterSpace} in this context defined by a persister which exposes the
+ * specified property.
+ *
+ * @param propertyName The name of the property.
+ * @return The persister space, or null.
+ */
+ public PersisterSpace locatePersisterSpaceExposingProperty(String propertyName);
+
+ /**
+ * Registers a persister space in this context.
+ *
+ * @param persisterSpace The persister reference to register.
+ */
+ public void registerPersisterSpace(PersisterSpace persisterSpace);
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterTableExpressionGenerator.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterTableExpressionGenerator.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PersisterTableExpressionGenerator.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,128 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve;
+
+import org.hibernate.persister.MappedTableMetadata;
+import org.hibernate.persister.entity.Queryable;
+import org.hibernate.sql.ast.alias.TableAliasGenerator;
+import org.hibernate.sql.ast.common.HibernateTree;
+import org.hibernate.sql.ast.phase.hql.parse.HQLParser;
+import org.hibernate.sql.ast.tree.Table;
+
+/**
+ * Generate table expressions for persisters.
+ * <p/>
+ * NOTE : temporary, until such time as we are able to have the persisters themselves return these structures.
+ *
+ * @author Steve Ebersole
+ */
+public class PersisterTableExpressionGenerator {
+ public static Table generateTableExpression(
+ Queryable persister,
+ TableAliasGenerator.TableAliasRoot aliasRoot,
+ Table.EntityTableSpace tableSpace) {
+ MappedTableMetadata tableMetadata = persister.getMappedTableMetadata();
+
+ final String drivingTableName = tableMetadata.getDrivingTableName();
+ final String[] drivingTableJoinColumns = tableMetadata.getIdentifierColumnNames();
+ final String drivingTableAlias = aliasRoot.generate( 0 );
+ final Table drivingTable = generateTableReference( drivingTableName, drivingTableAlias, tableSpace );
+
+ int suffix = 0;
+
+ MappedTableMetadata.JoinedTable[] tables = tableMetadata.getJoinedTables();
+ for ( int i = 0; i < tables.length; i++ ) {
+ final String joinTableAlias = aliasRoot.generate( ++suffix );
+ final Table table = generateTableReference( tables[i].getName(), joinTableAlias, tableSpace );
+
+ final HibernateTree join = new HibernateTree( HQLParser.JOIN, "join" );
+ drivingTable.addChild( join );
+ if ( tables[i].useInnerJoin() ) {
+ join.addChild( new HibernateTree( HQLParser.INNER, "inner" ) );
+ }
+ else {
+ join.addChild( new HibernateTree( HQLParser.LEFT, "left outer" ) );
+ }
+ join.addChild( table );
+
+ final HibernateTree on = new HibernateTree( HQLParser.ON, "on" );
+ join.addChild( on );
+ final HibernateTree joinCondition = generateJoinCorrelation(
+ drivingTableAlias,
+ drivingTableJoinColumns,
+ joinTableAlias,
+ tables[i].getKeyColumns()
+ );
+ on.addChild( joinCondition );
+ }
+
+ return drivingTable;
+ }
+
+ private static Table generateTableReference(String tableName, String tableAlias, Table.TableSpace tableSpace) {
+ Table table = new Table( HQLParser.TABLE, tableSpace );
+ table.addChild( new HibernateTree( HQLParser.IDENTIFIER, tableName ) );
+ table.addChild( new HibernateTree( HQLParser.ALIAS_NAME, tableAlias ) );
+ return table;
+ }
+
+ public static HibernateTree generateJoinCorrelation(
+ String lhsAlias,
+ String[] lhsColumns,
+ String rhsAlias,
+ String[] rhsColumns) {
+ HibernateTree correlation = generateJoinCorrelation( lhsAlias, lhsColumns[0], rhsAlias, rhsColumns[0] );
+ if ( lhsColumns.length > 1 ) {
+ for ( int i = 1; i < lhsColumns.length; i++ ) {
+ HibernateTree previous = correlation;
+ correlation = new HibernateTree( HQLParser.AND, "and" );
+ correlation.addChild( previous );
+ correlation.addChild( generateJoinCorrelation( lhsAlias, lhsColumns[i], rhsAlias, rhsColumns[i] ) );
+ }
+ }
+ return correlation;
+ }
+
+ public static HibernateTree generateJoinCorrelation(String lhsAlias, String lhsColumn, String rhsAlias, String rhsColumn) {
+ HibernateTree lhs = new HibernateTree( HQLParser.COLUMN );
+ lhs.addChild( new HibernateTree( HQLParser.ALIAS_REF, lhsAlias ) );
+ lhs.addChild( new HibernateTree( HQLParser.IDENTIFIER, lhsColumn ) );
+
+ HibernateTree rhs = new HibernateTree( HQLParser.COLUMN );
+ rhs.addChild( new HibernateTree( HQLParser.ALIAS_REF, rhsAlias ) );
+ rhs.addChild( new HibernateTree( HQLParser.IDENTIFIER, rhsColumn ) );
+
+ HibernateTree correlation = new HibernateTree( HQLParser.EQUALS, "=" );
+ correlation.addChild( lhs );
+ correlation.addChild( rhs );
+
+ return correlation;
+ }
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PropertyPathTerminus.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PropertyPathTerminus.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/PropertyPathTerminus.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,40 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve;
+
+import org.hibernate.sql.ast.common.HibernateTree;
+
+/**
+ * Represents the terminal part of a property path.
+ *
+ * @author Steve Ebersole
+ */
+public abstract class PropertyPathTerminus extends HibernateTree {
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/ResolutionContext.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/ResolutionContext.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/ResolutionContext.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,103 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve;
+
+import org.antlr.runtime.tree.TreeAdaptor;
+
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.sql.ast.alias.ImplicitAliasGenerator;
+import org.hibernate.sql.ast.util.TreePrinter;
+import org.hibernate.sql.ast.phase.hql.resolve.path.PathResolutionStrategy;
+
+/**
+ * todo : javadocs
+ *
+ * @author Steve Ebersole
+ */
+public interface ResolutionContext {
+
+ /**
+ * The session factory available for this context. Providing, for example, mapping information.
+ *
+ * @return The session factory.
+ */
+ public SessionFactoryImplementor getSessionFactoryImplementor();
+
+ public TreeAdaptor getTreeAdaptor();
+
+// /**
+// * The alias builder available in this context.
+// *
+// * @return The alias builder.
+// */
+// public ImplicitAliasGenerator getAliasBuilder();
+
+ /**
+ * The current {@link PersisterSpaceContext} for this context. The {@link PersisterSpaceContext}
+ * can change in relation to subqueries and such. See {@link PersisterSpaceContext} docs for more info.
+ *
+ * @return The current {@link PersisterSpaceContext} for this resolution context.
+ */
+ public PersisterSpaceContext getCurrentPersisterSpaceContext();
+
+// /**
+// * The builder of {@link PersisterReference} instances for this context.
+// *
+// * @return The {@link PersisterReference} builder.
+// */
+// public PersisterReferenceBuilder getPersisterReferenceBuilder();
+//
+// /**
+// * The builder of {@link Join} instances pertaining to property joins for this context.
+// *
+// * @return The property {@link Join} builder.
+// */
+// public PropertyJoinBuilder getPropertyJoinBuilder();
+
+ /**
+ * The tree printer available for this context.
+ *
+ * @return The tree printer.
+ */
+ public TreePrinter getTreePrinter();
+
+ /**
+ * Is this context currently processing a function?
+ *
+ * @return True or false.
+ */
+ public boolean isCurrentlyProcessingFunction();
+
+ public PathResolutionStrategy getCurrentPathResolutionStrategy();
+
+// public void registerAssociationFetch(Join join);
+//
+// public void registerPropertyFetch(PersisterReference persisterReference);
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathResolutionStrategy.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathResolutionStrategy.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathResolutionStrategy.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,95 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve.path;
+
+import org.hibernate.sql.ast.phase.hql.resolve.PersisterSpace;
+import org.hibernate.sql.ast.phase.hql.resolve.PropertyPathTerminus;
+import org.hibernate.sql.ast.common.HibernateTree;
+
+/**
+ * Applies a strategy pattern to the manner in which path expressions are normalized, allowing contextual pluggability
+ * of the implicit-join and index-access handling rules...
+ *
+ * @author Steve Ebersole
+ */
+public interface PathResolutionStrategy {
+ /**
+ * Handle the root of the pathed property reference.
+ *
+ * @param persisterReference The root of the path.
+ *
+ * @return The source representation of the path root.
+ */
+ public PathedPropertyReferenceSource handleRoot(PersisterSpace persisterReference);
+
+ /**
+ * Handle an intermeidary path part.
+ *
+ * @param source The source of the property reference.
+ * @param pathPart The current property path part.
+ *
+ * @return The new source for further property part handling.
+ */
+ public PathedPropertyReferenceSource handleIntermediatePathPart(PathedPropertyReferenceSource source, String pathPart);
+
+ /**
+ * Handle the terminal path part.
+ *
+ * @param source The source of the property reference.
+ * @param pathPart The current (and terminal/last) path part.
+ *
+ * @return The terminal property reference indicated by the overall path.
+ */
+ public PropertyPathTerminus handleTerminalPathPart(PathedPropertyReferenceSource source, String pathPart);
+
+ /**
+ * Handle an index access operation (a.b[selector] for example). In this particular case the index access
+ * is further dereferenced (it is intermediate).
+ *
+ * @param source The source of the property reference.
+ * @param pathPart The current property path part, here specifically naming the collection property
+ * @param selector The index selection expression
+ *
+ * @return The new source for further property part handling.
+ */
+ public PathedPropertyReferenceSource handleIntermediateIndexAccess(PathedPropertyReferenceSource source, String pathPart, HibernateTree selector);
+
+ /**
+ * Handle an index access operation (a.b[selector] for example). In this particular case the index access
+ * is the terminus of the path expression.
+ *
+ * @param source The source of the property reference.
+ * @param pathPart The current property path part, here specifically naming the collection property
+ * @param selector The index selection expression
+ *
+ * @return The terminal property reference indicated by the overall path.
+ */
+ public PropertyPathTerminus handleTerminalIndexAccess(PathedPropertyReferenceSource source, String pathPart, HibernateTree selector);
+}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathedPropertyReferenceSource.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathedPropertyReferenceSource.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/phase/hql/resolve/path/PathedPropertyReferenceSource.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,92 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party
+ * contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software
+ * Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+package org.hibernate.sql.ast.phase.hql.resolve.path;
+
+import org.antlr.runtime.tree.Tree;
+
+import org.hibernate.sql.ast.common.HibernateTree;
+import org.hibernate.sql.ast.phase.hql.resolve.PropertyPathTerminus;
+
+/**
+ * The contract for representing the non-terminal parts of a property path expression
+ * <p/>
+ * NOTE : extends AST so the grammar can more easily handle it, not because it will actually end up in the syntax
+ * tree (it will not).
+ *
+ * @author Steve Ebersole
+ */
+public interface PathedPropertyReferenceSource extends Tree {
+ /**
+ * Return the path which led to this source.
+ *
+ * @return The origination path.
+ */
+ public String getOriginationPath();
+
+ /**
+ * Handle an intermediate path part reference.
+ *
+ * @param name The name for the path part to handle.
+ *
+ * @return An appropriate source representation of said intermeidate path part.
+ */
+ public PathedPropertyReferenceSource handleIntermediatePathPart(String name);
+
+ /**
+ * Handle the terminal path reference.
+ *
+ * @param name The name of the terminal path part.
+ *
+ * @return The property reference terminus.
+ */
+ public PropertyPathTerminus handleTerminalPathPart(String name);
+
+ /**
+ * Handle an index access operation (a.b[selector] for example). In this particular case the index access
+ * is further dereferenced (it is intermediate).
+ *
+ * @param collectionPropertyName The name of the collection property to which the index operator applies
+ * @param selector The index selection expression
+ *
+ * @return An appropriate source representation of said intermeidate path part.
+ */
+ public PathedPropertyReferenceSource handleIntermediateIndexAccess(String collectionPropertyName, HibernateTree selector);
+
+ /**
+ * Handle an index access operation (a.b[selector] for example). In this particular case the index access
+ * is the terminus of the path expression.
+ *
+ * @param collectionPropertyName The name of the collection property to which the index operator applies
+ * @param selector The index selection expression
+ *
+ * @return The property reference terminus.
+ */
+ public PropertyPathTerminus handleTerminalIndexAccess(String collectionPropertyName, HibernateTree selector);
+}
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -38,6 +38,7 @@
import org.hibernate.type.Type;
import org.hibernate.sql.ast.alias.ImplicitAliasGenerator;
import org.hibernate.sql.ast.common.HibernateTree;
+import org.hibernate.sql.ast.common.HibernateToken;
import org.hibernate.sql.ast.util.DisplayableNode;
import org.hibernate.sql.ast.phase.hql.parse.HQLParser;
import org.hibernate.persister.entity.Queryable;
@@ -62,6 +63,10 @@
this( node.getToken(), tableSpace );
}
+ public Table(int tokenType, TableSpace tableSpace) {
+ this( new HibernateToken( tokenType ), tableSpace );
+ }
+
public TableSpace getTableSpace() {
return tableSpace;
}
Deleted: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTAppender.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTAppender.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTAppender.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -1,68 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.sql.ast.util;
-
-import antlr.ASTFactory;
-import antlr.collections.AST;
-
-/**
- * Appends child nodes to a parent efficiently.
- *
- * @author Joshua Davis
- */
-public class ASTAppender {
- private AST parent;
- private AST last;
- private ASTFactory factory;
-
- public ASTAppender(ASTFactory factory, AST parent) {
- this( parent );
- this.factory = factory;
- }
-
- public ASTAppender(AST parent) {
- this.parent = parent;
- this.last = ASTUtil.getLastChild( parent );
- }
-
- public AST append(int type, String text, boolean appendIfEmpty) {
- if ( text != null && ( appendIfEmpty || text.length() > 0 ) ) {
- return append( factory.create( type, text ) );
- }
- else {
- return null;
- }
- }
-
- public AST append(AST child) {
- if ( last == null ) {
- parent.setFirstChild( child );
- }
- else {
- last.setNextSibling( child );
- }
- last = child;
- return last;
- }
-}
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTPrinter.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTPrinter.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/ASTPrinter.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -64,7 +64,7 @@
*
* @param tokenTypeConstants The token types to use during printing; typically the {vocabulary}TokenTypes.java
* interface generated by ANTLR.
- * @param showClassNames Should the class names of the {@link org.hibernate.sql.ast.common.Node} impls be displayed.
+ * @param showClassNames Should the class names of the {@link org.hibernate.sql.ast.common.HibernateToken} impls be displayed.
*/
public ASTPrinter(Class tokenTypeConstants, boolean showClassNames) {
this( ASTUtil.generateTokenNameCache( tokenTypeConstants ), showClassNames );
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/DisplayableNode.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/DisplayableNode.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/DisplayableNode.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -24,7 +24,7 @@
package org.hibernate.sql.ast.util;
/**
- * Contract for {@link org.hibernate.sql.ast.common.Node} implementations which wish to return customized display information
+ * Contract for {@link org.hibernate.sql.ast.common.HibernateToken} implementations which wish to return customized display information
* about themselves.
*
* @author Steve Ebersole
Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/NodeTraverser.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/NodeTraverser.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/NodeTraverser.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -31,6 +31,9 @@
* @author Steve Ebersole
*/
public class NodeTraverser {
+
+ // todo : look at org.antlr.runtime.tree.TreeVisitor/TreeVsitorAction
+
public static interface VisitationStrategy {
public void visit(AST node);
}
Added: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/TreePrinter.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/TreePrinter.java (rev 0)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/util/TreePrinter.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -0,0 +1,233 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.sql.ast.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.hibernate.util.StringHelper;
+import org.antlr.runtime.tree.Tree;
+
+/**
+ * Utility for generating pretty "ASCII art" representations of syntax trees.
+ *
+ * @author Joshua Davis
+ * @author Steve Ebersole
+ */
+public class TreePrinter {
+ private final Map tokenTypeNameCache;
+ private final boolean showClassNames;
+
+ /**
+ * Constructs a printer.
+ * <p/>
+ * Delegates to {@link #TreePrinter(Class, boolean)} with {@link #isShowClassNames showClassNames} as <tt>false</tt>
+ *
+ * @param tokenTypeConstants The token types to use during printing; typically the {vocabulary}TokenTypes.java
+ * interface generated by ANTLR.
+ */
+ public TreePrinter(Class tokenTypeConstants) {
+ this( ASTUtil.generateTokenNameCache( tokenTypeConstants ), false );
+ }
+
+ public TreePrinter(boolean showClassNames) {
+ this( ( Map ) null, showClassNames );
+ }
+
+ /**
+ * Constructs a printer.
+ *
+ * @param tokenTypeConstants The token types to use during printing; typically the {vocabulary}TokenTypes.java
+ * interface generated by ANTLR.
+ * @param showClassNames Should the class names of the tree nodes impls be displayed.
+ */
+ public TreePrinter(Class tokenTypeConstants, boolean showClassNames) {
+ this( ASTUtil.generateTokenNameCache( tokenTypeConstants ), showClassNames );
+ }
+
+ private TreePrinter(Map tokenTypeNameCache, boolean showClassNames) {
+ this.tokenTypeNameCache = tokenTypeNameCache;
+ this.showClassNames = showClassNames;
+ }
+
+ /**
+ * Getter for property 'showClassNames'.
+ *
+ * @return Value for property 'showClassNames'.
+ */
+ public boolean isShowClassNames() {
+ return showClassNames;
+ }
+
+ /**
+ * Renders the tree into 'ASCII art' form and returns that string representation.
+ *
+ * @param tree The tree to display.
+ * @param header The header for the display.
+ *
+ * @return The'ASCII art' form, as a string.
+ */
+ public String renderAsString(Tree tree, String header) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream( baos );
+ ps.println( header );
+ render( tree, ps );
+ ps.flush();
+ return new String( baos.toByteArray() );
+ }
+
+ /**
+ * Prints the tree in 'ASCII art' form to the specified print stream.
+ *
+ * @param tree The tree to print.
+ * @param out The print stream to which the tree should be printed.
+ */
+ public void render(Tree tree, PrintStream out) {
+ render( tree, new PrintWriter( out ) );
+ }
+
+ /**
+ * Prints the tree in 'ASCII art' tree form to the specified print writer.
+ *
+ * @param tree The tree to print.
+ * @param pw The print writer to which the tree should be written.
+ */
+ public void render(Tree tree, PrintWriter pw) {
+ ArrayList parents = new ArrayList();
+ render( parents, pw, tree );
+ pw.flush();
+ }
+
+ /**
+ * Returns the token type name for the given token type.
+ *
+ * @param type The token type.
+ * @return String - The token type name from the token type constant class,
+ * or just the integer as a string if none exists.
+ */
+ public String getTokenTypeName(int type) {
+ final Integer typeInteger = new Integer( type );
+ String value = null;
+ if ( tokenTypeNameCache != null ) {
+ value = ( String ) tokenTypeNameCache.get( typeInteger );
+ }
+ if ( value == null ) {
+ value = typeInteger.toString();
+ }
+ return value;
+ }
+
+ private void render(ArrayList parents, PrintWriter pw, Tree tree) {
+ if ( tree == null ) {
+ pw.println( "tree is null!" );
+ return;
+ }
+
+ // Tree.getChildIndex() -> the tree's position within its parent's children...
+
+ for ( int i = 0; i < parents.size(); i++ ) {
+ final Tree parent = ( Tree ) parents.get( i );
+ if ( hasNextSibling( parent ) ) {
+ pw.print( " " );
+ }
+ else {
+ pw.print( " | " );
+ }
+ }
+
+ if ( hasNextSibling( tree ) ) {
+ pw.print( " \\-" );
+ }
+ else {
+ pw.print( " +-" );
+ }
+
+ writeNode( pw, tree );
+
+ ArrayList newParents = new ArrayList( parents );
+ newParents.add( tree );
+ for ( int i = 0; i < tree.getChildCount(); i++ ) {
+ render( newParents, pw, tree.getChild( i ) );
+ }
+ newParents.clear();
+ }
+
+ private boolean hasNextSibling(Tree tree) {
+ return tree.getParent() != null
+ && tree.getParent().getChildCount() <= tree.getChildIndex();
+ }
+
+ private void writeNode(PrintWriter pw, Tree tree) {
+ pw.println( nodeToString( tree ) );
+ }
+
+ private String nodeToString(Tree tree) {
+ if ( tree == null ) {
+ return "{node:null}";
+ }
+
+ StringBuffer buf = new StringBuffer();
+ buf.append( "[" ).append( getTokenTypeName( tree.getType() ) ).append( "] " );
+ if ( showClassNames ) {
+ buf.append( StringHelper.unqualify( tree.getClass().getName() ) ).append( ": " );
+ }
+
+ buf.append( "'" );
+ String text = tree.getText();
+ if ( text == null ) {
+ text = "{text:null}";
+ }
+ appendEscapedMultibyteChars(text, buf);
+ buf.append( "'" );
+
+ if ( tree instanceof DisplayableNode ) {
+ DisplayableNode displayableNode = ( DisplayableNode ) tree;
+ // Add a space before the display text.
+ buf.append( " " ).append( displayableNode.getDisplayText() );
+ }
+ return buf.toString();
+ }
+
+ public static void appendEscapedMultibyteChars(String text, StringBuffer buf) {
+ char[] chars = text.toCharArray();
+ for (int i = 0; i < chars.length; i++) {
+ char aChar = chars[i];
+ if (aChar > 256) {
+ buf.append("\\u");
+ buf.append(Integer.toHexString(aChar));
+ }
+ else
+ buf.append(aChar);
+ }
+ }
+
+ public static String escapeMultibyteChars(String text) {
+ StringBuffer buf = new StringBuffer();
+ appendEscapedMultibyteChars(text,buf);
+ return buf.toString();
+ }
+}
Modified: core/branches/antlr3/src/test/java/org/hibernate/sql/TemplateTest.java
===================================================================
--- core/branches/antlr3/src/test/java/org/hibernate/sql/TemplateTest.java 2009-04-20 21:58:44 UTC (rev 16366)
+++ core/branches/antlr3/src/test/java/org/hibernate/sql/TemplateTest.java 2009-04-20 22:26:31 UTC (rev 16367)
@@ -85,99 +85,104 @@
private static final SQLFunctionRegistry FUNCTION_REGISTRY = new SQLFunctionRegistry( DIALECT, Collections.EMPTY_MAP );
- public void testSQLReferences() {
- String fragment = "sql asc, sql desc";
- String template = doStandardRendering( fragment );
+ public void testParsing() {
+ String fragment = "sql asc, sql desc";
+ String template = doStandardRendering( fragment );
+ }
- assertEquals( Template.TEMPLATE + ".sql asc, " + Template.TEMPLATE + ".sql desc", template );
- }
+// public void testSQLReferences() {
+// String fragment = "sql asc, sql desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".sql asc, " + Template.TEMPLATE + ".sql desc", template );
+// }
+//
+// public void testQuotedSQLReferences() {
+// String fragment = "`sql` asc, `sql` desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".\"sql\" asc, " + Template.TEMPLATE + ".\"sql\" desc", template );
+// }
+//
+// public void testPropertyReference() {
+// String fragment = "property asc, property desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".prop asc, " + Template.TEMPLATE + ".prop desc", template );
+// }
+//
+// public void testFunctionReference() {
+// String fragment = "upper(sql) asc, lower(sql) desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "upper(" + Template.TEMPLATE + ".sql) asc, lower(" + Template.TEMPLATE + ".sql) desc", template );
+// }
+//
+// public void testQualifiedFunctionReference() {
+// String fragment = "qual.upper(property) asc, qual.lower(property) desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "qual.upper(" + Template.TEMPLATE + ".prop) asc, qual.lower(" + Template.TEMPLATE + ".prop) desc", template );
+// }
+//
+// public void testDoubleQualifiedFunctionReference() {
+// String fragment = "qual1.qual2.upper(property) asc, qual1.qual2.lower(property) desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "qual1.qual2.upper(" + Template.TEMPLATE + ".prop) asc, qual1.qual2.lower(" + Template.TEMPLATE + ".prop) desc", template );
+// }
+//
+// public void testFunctionWithPropertyReferenceAsParam() {
+// String fragment = "upper(property) asc, lower(property) desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "upper(" + Template.TEMPLATE + ".prop) asc, lower(" + Template.TEMPLATE + ".prop) desc", template );
+// }
+//
+// public void testNestedFunctionReferences() {
+// String fragment = "upper(lower(sql)) asc, lower(upper(sql)) desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "upper(lower(" + Template.TEMPLATE + ".sql)) asc, lower(upper(" + Template.TEMPLATE + ".sql)) desc", template );
+// }
+//
+// public void testComplexNestedFunctionReferences() {
+// String fragment = "mod(mod(sql,2),3) asc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( "mod(mod(" + Template.TEMPLATE + ".sql, 2), 3) asc", template );
+// }
+//
+// public void testCollation() {
+// String fragment = "`sql` COLLATE my_collation, `sql` COLLATE your_collation";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".\"sql\" collate my_collation, " + Template.TEMPLATE + ".\"sql\" collate your_collation", template );
+// }
+//
+// public void testCollationAndOrdering() {
+// String fragment = "sql COLLATE my_collation, upper(prop) COLLATE your_collation asc, `sql` desc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".sql collate my_collation, upper(" + Template.TEMPLATE + ".prop) collate your_collation asc, " + Template.TEMPLATE + ".\"sql\" desc", template );
+//
+// }
+//
+// public void testComponentReferences() {
+// String fragment = "component asc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".comp_1 asc, " + Template.TEMPLATE + ".comp_2 asc", template );
+//
+// }
+//
+// public void testComponentDerefReferences() {
+// String fragment = "component.prop1 asc";
+// String template = doStandardRendering( fragment );
+//
+// assertEquals( Template.TEMPLATE + ".comp_1 asc", template );
+// }
- public void testQuotedSQLReferences() {
- String fragment = "`sql` asc, `sql` desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".\"sql\" asc, " + Template.TEMPLATE + ".\"sql\" desc", template );
- }
-
- public void testPropertyReference() {
- String fragment = "property asc, property desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".prop asc, " + Template.TEMPLATE + ".prop desc", template );
- }
-
- public void testFunctionReference() {
- String fragment = "upper(sql) asc, lower(sql) desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "upper(" + Template.TEMPLATE + ".sql) asc, lower(" + Template.TEMPLATE + ".sql) desc", template );
- }
-
- public void testQualifiedFunctionReference() {
- String fragment = "qual.upper(property) asc, qual.lower(property) desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "qual.upper(" + Template.TEMPLATE + ".prop) asc, qual.lower(" + Template.TEMPLATE + ".prop) desc", template );
- }
-
- public void testDoubleQualifiedFunctionReference() {
- String fragment = "qual1.qual2.upper(property) asc, qual1.qual2.lower(property) desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "qual1.qual2.upper(" + Template.TEMPLATE + ".prop) asc, qual1.qual2.lower(" + Template.TEMPLATE + ".prop) desc", template );
- }
-
- public void testFunctionWithPropertyReferenceAsParam() {
- String fragment = "upper(property) asc, lower(property) desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "upper(" + Template.TEMPLATE + ".prop) asc, lower(" + Template.TEMPLATE + ".prop) desc", template );
- }
-
- public void testNestedFunctionReferences() {
- String fragment = "upper(lower(sql)) asc, lower(upper(sql)) desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "upper(lower(" + Template.TEMPLATE + ".sql)) asc, lower(upper(" + Template.TEMPLATE + ".sql)) desc", template );
- }
-
- public void testComplexNestedFunctionReferences() {
- String fragment = "mod(mod(sql,2),3) asc";
- String template = doStandardRendering( fragment );
-
- assertEquals( "mod(mod(" + Template.TEMPLATE + ".sql, 2), 3) asc", template );
- }
-
- public void testCollation() {
- String fragment = "`sql` COLLATE my_collation, `sql` COLLATE your_collation";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".\"sql\" collate my_collation, " + Template.TEMPLATE + ".\"sql\" collate your_collation", template );
- }
-
- public void testCollationAndOrdering() {
- String fragment = "sql COLLATE my_collation, upper(prop) COLLATE your_collation asc, `sql` desc";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".sql collate my_collation, upper(" + Template.TEMPLATE + ".prop) collate your_collation asc, " + Template.TEMPLATE + ".\"sql\" desc", template );
-
- }
-
- public void testComponentReferences() {
- String fragment = "component asc";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".comp_1 asc, " + Template.TEMPLATE + ".comp_2 asc", template );
-
- }
-
- public void testComponentDerefReferences() {
- String fragment = "component.prop1 asc";
- String template = doStandardRendering( fragment );
-
- assertEquals( Template.TEMPLATE + ".comp_1 asc", template );
- }
-
public String doStandardRendering(String fragment) {
return Template.renderOrderByStringTemplate( fragment, MAPPER, null, DIALECT, FUNCTION_REGISTRY );
}
More information about the hibernate-commits
mailing list