db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql SqlQueryStatement.java SqlSelectStatement.java
Date Sat, 22 Jan 2005 20:12:45 GMT
brj         2005/01/22 12:12:45

  Modified:    src/java/org/apache/ojb/broker/accesslayer/sql
                        SqlQueryStatement.java SqlSelectStatement.java
  Log:
  small refactorings
  
  Revision  Changes    Path
  1.95      +18 -5     db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
  
  Index: SqlQueryStatement.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- SqlQueryStatement.java	13 Jan 2005 19:49:56 -0000	1.94
  +++ SqlQueryStatement.java	22 Jan 2005 20:12:45 -0000	1.95
  @@ -1086,13 +1086,26 @@
           buf.append(".");
           appendColumn(aColumn, buf);
       }
  -    
  +
  +    /**
  +     * Append a Column with alias: A0 name -> A0.name
  +     * @param anAlias the TableAlias
  +     * @param aColumn name
  +     * @param buf
  +     */
  +    protected void appendColumn(TableAlias anAlias, String aColumn, StringBuffer buf)
  +    {
  +        appendTable(anAlias.alias, buf);
  +        buf.append(".");
  +        appendColumn(aColumn, buf);
  +    }
  +
       /**
        * Append the TableAlias
        * @param anAlias
        * @param buf
        */
  -    private void appendTableAlias(TableAliasHandler.TableAlias anAlias, StringBuffer buf)
  +    private void appendTableAlias(TableAlias anAlias, StringBuffer buf)
       {
           appendTable(anAlias.table, buf);
           buf.append(" ").append(anAlias.alias);
  @@ -1231,7 +1244,7 @@
               {
                   buf.append(" AND ");
               }
  -            appendColumn(join.left.alias, join.leftKeys[i], buf);
  +            appendColumn(join.left, join.leftKeys[i], buf);
   
               if (join.isOuter && joinSyntax == SYBASE_JOIN_SYNTAX)
               {
  @@ -1242,7 +1255,7 @@
                   buf.append("=");
               }
   
  -            appendColumn(join.right.alias, join.rightKeys[i], buf);
  +            appendColumn(join.right, join.rightKeys[i], buf);
   
               if (join.isOuter && joinSyntax == ORACLE_JOIN_SYNTAX)
               {
  
  
  
  1.35      +292 -285  db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java
  
  Index: SqlSelectStatement.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- SqlSelectStatement.java	27 Nov 2004 14:49:53 -0000	1.34
  +++ SqlSelectStatement.java	22 Jan 2005 20:12:45 -0000	1.35
  @@ -1,285 +1,292 @@
  -package org.apache.ojb.broker.accesslayer.sql;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  - *
  - * Licensed under the Apache License, Version 2.0 (the "License");
  - * you may not use this file except in compliance with the License.
  - * You may obtain a copy of the License at
  - *
  - *     http://www.apache.org/licenses/LICENSE-2.0
  - *
  - * Unless required by applicable law or agreed to in writing, software
  - * distributed under the License is distributed on an "AS IS" BASIS,
  - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  - * See the License for the specific language governing permissions and
  - * limitations under the License.
  - */
  -
  -import java.util.ArrayList;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Map;
  -
  -import org.apache.ojb.broker.metadata.ClassDescriptor;
  -import org.apache.ojb.broker.metadata.FieldDescriptor;
  -import org.apache.ojb.broker.platforms.Platform;
  -import org.apache.ojb.broker.query.Criteria;
  -import org.apache.ojb.broker.query.Query;
  -import org.apache.ojb.broker.query.ReportQuery;
  -import org.apache.ojb.broker.util.logging.Logger;
  -
  -/**
  - * Model a SELECT Statement
  - *
  - * @author <a href="mailto:jbraeuchi@hotmail.com">Jakob Braeuchi</a>
  - * @version $Id$
  - */
  -public class SqlSelectStatement extends SqlQueryStatement
  -{
  -
  -    /**
  -     * Constructor for SqlSelectStatement.
  -     * @param aPlatform
  -     * @param aLogger
  -     * @param aCld
  -     * @param aQuery
  -     */
  -    public SqlSelectStatement(Platform aPlatform, Logger aLogger, ClassDescriptor aCld,
Query aQuery)
  -    {
  -        super(aPlatform, aLogger, aCld, aQuery);
  -    }
  -
  -    /**
  -     * Constructor for SqlSelectStatement.
  -     *
  -     * @param parent
  -     * @param pf
  -     * @param cld
  -     * @param query
  -     * @param logger
  -     */
  -    public SqlSelectStatement(SqlQueryStatement parent, Platform pf, ClassDescriptor cld,
Query query, Logger logger)
  -    {
  -        super(pf, logger, parent, cld, query);
  -    }
  -
  -    /**
  -     * Appends to the statement a comma separated list of column names.
  -     *
  -     * MBAIRD: if the object being queried on has multiple classes mapped to the table,
  -     * then we will get all the fields that are a unique set across all those classes so
if we need to
  -     * we can materialize an extent
  -     *
  -     * DO NOT use this if order of columns is important. The row readers build reflectively
and look up
  -     * column names to find values, so this is safe. In the case of update, you CANNOT
use this as the
  -     * order of columns is important.
  -     *
  -     * @return list of column names for the set of all unique columns for multiple classes
mapped to the
  -     * same table.
  -     */
  -    protected List appendListOfColumnsForSelect(ClassDescriptor cld, StringBuffer buf)
  -    {
  -        FieldDescriptor[] fieldDescriptors = cld.getRepository().getFieldDescriptorsForMultiMappedTable(cld);
  -        int fieldDescriptorLength = fieldDescriptors.length;
  -        ArrayList columnList = new ArrayList();
  -        int i = 0;
  -        String alias = getSearchAlias().alias;
  -
  -        FieldDescriptor field = null;
  -        for (int j = 0; j < fieldDescriptorLength; j++)
  -        {
  -            field = fieldDescriptors[j];
  -            if (i > 0)
  -            {
  -                buf.append(",");
  -            }
  -            appendColumn(alias, field.getColumnName(), buf);
  -            columnList.add(field.getAttributeName());
  -            i++;
  -        }
  -        return columnList;
  -    }
  -
  -    /**
  -     * Appends to the statement a comma separated list of column names.
  -     *
  -     * @param columns defines the columns to be selected (for reports)
  -     * @return list of column names
  -     */
  -    protected List appendListOfColumns(String[] columns, StringBuffer buf)
  -    {
  -        ArrayList columnList = new ArrayList();
  -
  -        for (int i = 0; i < columns.length; i++)
  -        {
  -            if (i > 0)
  -            {
  -                buf.append(",");
  -            }
  -            appendAttribute(columns[i], false, null, buf);
  -            columnList.add(columns[i]);
  -        }
  -        return columnList;
  -    }
  -
  -    /**
  -     * Answer the SELECT-Sql for the Statement
  -     */
  -    public String getStatement()
  -    {
  -        StringBuffer stmt = new StringBuffer(1024);
  -        Query query = getQuery();
  -        boolean first = true;
  -        List orderByFields = null;
  -        String[] attributes = null;
  -        String[] joinAttributes = null;
  -        Iterator it = getJoinTreeToCriteria().entrySet().iterator();
  -        List columnList = new ArrayList();
  -
  -        if (query instanceof ReportQuery)
  -        {
  -            attributes = ((ReportQuery) query).getAttributes();
  -            joinAttributes = ((ReportQuery) query).getJoinAttributes();
  -        }
  -
  -        while (it.hasNext())
  -        {
  -            Map.Entry entry = (Map.Entry) it.next();
  -            Criteria whereCrit = (Criteria) entry.getValue();
  -            Criteria havingCrit = query.getHavingCriteria();
  -            StringBuffer where = new StringBuffer();
  -            StringBuffer having = new StringBuffer();
  -            List groupByFields = null;
  -
  -            // Set correct tree of joins for the current criteria
  -            setRootAlias((TableAliasHandler.TableAlias) entry.getKey());
  -
  -            if (whereCrit != null && whereCrit.isEmpty())
  -            {
  -                whereCrit = null;
  -            }
  -
  -            if (havingCrit != null && havingCrit.isEmpty())
  -            {
  -                havingCrit = null;
  -            }
  -
  -            if (first)
  -            {
  -                first = false;
  -            }
  -            else
  -            {
  -                stmt.append(" UNION ");
  -            }
  -
  -            stmt.append("SELECT ");
  -            if (query.isDistinct())
  -            {
  -                stmt.append("DISTINCT ");
  -            }
  -
  -            if (attributes == null || attributes.length == 0)
  -            {
  -                /**
  -                 * MBAIRD: use the appendListofColumnsForSelect, as it finds
  -                 * the union of select items for all object mapped to the same table. This
  -                 * will allow us to load objects with unique mapping fields that are mapped
  -                 * to the same table.
  -                 */                
  -                columnList.addAll(appendListOfColumnsForSelect(getSearchClassDescriptor(),
stmt));
  -            }
  -            else
  -            {
  -                columnList.addAll(appendListOfColumns(attributes, stmt));
  -            }
  -
  -            // BRJ:
  -            // joinColumns are only used to force the building of a join;
  -            // they are not appended to the select-clause !
  -            // these columns are used in COUNT-ReportQueries and
  -            // are taken from the query the COUNT is based on 
  -            if (joinAttributes != null && joinAttributes.length > 0)
  -            {
  -                for (int i = 0; i < joinAttributes.length; i++)
  -                {
  -					getAttributeInfo(joinAttributes[i], false, null, getQuery().getPathClasses());
  -                }
  -            }
  -
  -            groupByFields = query.getGroupBy();
  -            ensureColumns(groupByFields, columnList);
  -            
  -            orderByFields = query.getOrderBy();
  -            columnList = ensureColumns(orderByFields, columnList, stmt);
  -          
  -            /**
  -             * treeder: going to map superclass tables here, 
  -             * not sure about the columns, just using all columns for now
  -             */
  -            ClassDescriptor cld = getBaseClassDescriptor();
  -            ClassDescriptor cldSuper = null;
  -            if (cld.getSuperClass() != null)
  -            {
  -                // then we have a super class so join tables
  -                cldSuper = cld.getRepository().getDescriptorFor(cld.getSuperClass());
  -                appendSuperClassColumns(cld, cldSuper, stmt);
  -            }
  -
  -            stmt.append(" FROM ");
  -            appendTableWithJoins(getRootAlias(), where, stmt);
  -
  -            if (cld.getSuperClass() != null)
  -            {
  -                appendSuperClassJoin(cld, cldSuper, stmt, where);
  -            }
  -            
  -            appendWhereClause(where, whereCrit, stmt);
  -            appendGroupByClause(groupByFields, stmt);
  -            appendHavingClause(having, havingCrit, stmt);
  -        }
  -
  -        appendOrderByClause(orderByFields, columnList, stmt);
  -
  -        return stmt.toString();
  -    }
  -
  -    private void appendSuperClassJoin(ClassDescriptor cld, ClassDescriptor cldSuper, StringBuffer
stmt,
  -            StringBuffer where)
  -    {
  -        stmt.append(",");
  -        appendTable(cldSuper, stmt);
  -        if (where != null && where.length() > 0)
  -        {
  -            where.append(" AND ");
  -        }
  -        // get reference field in super class
  -        // TODO: do not use the superclassfield anymore, just assume that the id is the
same in both tables - @see PBroker.storeToDb
  -        int superFieldRef = cld.getSuperClassFieldRef();
  -        FieldDescriptor refField = cld.getFieldDescriptorByIndex(superFieldRef);
  -        appendTable(cldSuper, where);
  -        where.append(".");
  -        appendField(cldSuper.getAutoIncrementFields()[0], where);
  -    	where.append(" = ");
  -        appendTable(cld, where);
  -        where.append(".");
  -        appendField(refField, where);
  -    }
  -
  -    private void appendSuperClassColumns(ClassDescriptor cldSub, ClassDescriptor cldSuper,
StringBuffer buf)
  -    {
  -        FieldDescriptor[] fields = cldSuper.getFieldDescriptions();
  -        for (int i = 0; i < fields.length; i++)
  -        {
  -            FieldDescriptor field = fields[i];
  -            if (i > 0)
  -            {
  -                buf.append(",");
  -            }
  -            
  -            appendColumn(cldSuper.getFullTableName(), field.getColumnName(), buf);
  -        }
  -
  -    }
  -
  -}
  +package org.apache.ojb.broker.accesslayer.sql;
  +
  +/* Copyright 2002-2004 The Apache Software Foundation
  + *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *     http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +
  +import org.apache.ojb.broker.accesslayer.sql.TableAliasHandler.TableAlias;
  +import org.apache.ojb.broker.metadata.ClassDescriptor;
  +import org.apache.ojb.broker.metadata.FieldDescriptor;
  +import org.apache.ojb.broker.platforms.Platform;
  +import org.apache.ojb.broker.query.Criteria;
  +import org.apache.ojb.broker.query.Query;
  +import org.apache.ojb.broker.query.ReportQuery;
  +import org.apache.ojb.broker.util.logging.Logger;
  +
  +/**
  + * Model a SELECT Statement
  + *
  + * @author <a href="mailto:jbraeuchi@hotmail.com">Jakob Braeuchi</a>
  + * @version $Id$
  + */
  +public class SqlSelectStatement extends SqlQueryStatement
  +{
  +
  +    /**
  +     * Constructor for SqlSelectStatement.
  +     * @param aPlatform
  +     * @param aLogger
  +     * @param aCld
  +     * @param aQuery
  +     */
  +    public SqlSelectStatement(Platform aPlatform, Logger aLogger, ClassDescriptor aCld,
Query aQuery)
  +    {
  +        super(aPlatform, aLogger, aCld, aQuery);
  +    }
  +
  +    /**
  +     * Constructor for SqlSelectStatement.
  +     *
  +     * @param parent
  +     * @param pf
  +     * @param cld
  +     * @param query
  +     * @param logger
  +     */
  +    public SqlSelectStatement(SqlQueryStatement parent, Platform pf, ClassDescriptor cld,
Query query, Logger logger)
  +    {
  +        super(pf, logger, parent, cld, query);
  +    }
  +
  +    /**
  +     * Appends to the statement a comma separated list of column names.
  +     *
  +     * MBAIRD: if the object being queried on has multiple classes mapped to the table,
  +     * then we will get all the fields that are a unique set across all those classes so
if we need to
  +     * we can materialize an extent
  +     *
  +     * DO NOT use this if order of columns is important. The row readers build reflectively
and look up
  +     * column names to find values, so this is safe. In the case of update, you CANNOT
use this as the
  +     * order of columns is important.
  +     *
  +     * @return list of column names for the set of all unique columns for multiple classes
mapped to the
  +     * same table.
  +     */
  +    protected List appendListOfColumnsForSelect(ClassDescriptor cld, StringBuffer buf)
  +    {
  +        FieldDescriptor[] fieldDescriptors = cld.getRepository().getFieldDescriptorsForMultiMappedTable(cld);
  +        int fieldDescriptorLength = fieldDescriptors.length;
  +        ArrayList columnList = new ArrayList();
  +        int i = 0;
  +        TableAlias alias = getSearchAlias();
  +
  +        FieldDescriptor field = null;
  +        for (int j = 0; j < fieldDescriptorLength; j++)
  +        {
  +            field = fieldDescriptors[j];
  +            if (i > 0)
  +            {
  +                buf.append(",");
  +            }
  +            appendColumn(alias, field.getColumnName(), buf);
  +            columnList.add(field.getAttributeName());
  +            i++;
  +        }
  +        return columnList;
  +    }
  +
  +    /**
  +     * Appends to the statement a comma separated list of column names.
  +     *
  +     * @param columns defines the columns to be selected (for reports)
  +     * @return list of column names
  +     */
  +    protected List appendListOfColumns(String[] columns, StringBuffer buf)
  +    {
  +        ArrayList columnList = new ArrayList();
  +
  +        for (int i = 0; i < columns.length; i++)
  +        {
  +            if (i > 0)
  +            {
  +                buf.append(",");
  +            }
  +            appendAttribute(columns[i], false, null, buf);
  +            columnList.add(columns[i]);
  +        }
  +        return columnList;
  +    }
  +
  +    /**
  +     * Answer the SELECT-Sql for the Statement
  +     */
  +    public String getStatement()
  +    {
  +        StringBuffer stmt = new StringBuffer(1024);
  +        Query query = getQuery();
  +        boolean first = true;
  +        List orderByFields = null;
  +        String[] attributes = null;
  +        String[] joinAttributes = null;
  +        Iterator it = getJoinTreeToCriteria().entrySet().iterator();
  +        List columnList = new ArrayList();
  +
  +        if (query instanceof ReportQuery)
  +        {
  +            attributes = ((ReportQuery) query).getAttributes();
  +            joinAttributes = ((ReportQuery) query).getJoinAttributes();
  +        }
  +
  +        while (it.hasNext())
  +        {
  +            Map.Entry entry = (Map.Entry) it.next();
  +            Criteria whereCrit = (Criteria) entry.getValue();
  +            Criteria havingCrit = query.getHavingCriteria();
  +            StringBuffer where = new StringBuffer();
  +            StringBuffer having = new StringBuffer();
  +            List groupByFields = null;
  +
  +            // Set correct tree of joins for the current criteria
  +            setRootAlias((TableAliasHandler.TableAlias) entry.getKey());
  +
  +            if (whereCrit != null && whereCrit.isEmpty())
  +            {
  +                whereCrit = null;
  +            }
  +
  +            if (havingCrit != null && havingCrit.isEmpty())
  +            {
  +                havingCrit = null;
  +            }
  +
  +            if (first)
  +            {
  +                first = false;
  +            }
  +            else
  +            {
  +                stmt.append(" UNION ");
  +            }
  +
  +            stmt.append("SELECT ");
  +            if (query.isDistinct())
  +            {
  +                stmt.append("DISTINCT ");
  +            }
  +
  +            if (attributes == null || attributes.length == 0)
  +            {
  +                /**
  +                 * MBAIRD: use the appendListofColumnsForSelect, as it finds
  +                 * the union of select items for all object mapped to the same table. This
  +                 * will allow us to load objects with unique mapping fields that are mapped
  +                 * to the same table.
  +                 */                
  +                columnList.addAll(appendListOfColumnsForSelect(getSearchClassDescriptor(),
stmt));
  +            }
  +            else
  +            {
  +                columnList.addAll(appendListOfColumns(attributes, stmt));
  +            }
  +
  +            // BRJ:
  +            // joinColumns are only used to force the building of a join;
  +            // they are not appended to the select-clause !
  +            // these columns are used in COUNT-ReportQueries and
  +            // are taken from the query the COUNT is based on 
  +            if (joinAttributes != null && joinAttributes.length > 0)
  +            {
  +                for (int i = 0; i < joinAttributes.length; i++)
  +                {
  +					getAttributeInfo(joinAttributes[i], false, null, getQuery().getPathClasses());
  +                }
  +            }
  +
  +            groupByFields = query.getGroupBy();
  +            ensureColumns(groupByFields, columnList);
  +            
  +            orderByFields = query.getOrderBy();
  +            columnList = ensureColumns(orderByFields, columnList, stmt);
  +          
  +            /**
  +             * treeder: going to map superclass tables here, 
  +             * not sure about the columns, just using all columns for now
  +             */
  +            ClassDescriptor cld = getBaseClassDescriptor();
  +            ClassDescriptor cldSuper = null;
  +            if (cld.getSuperClass() != null)
  +            {
  +                // then we have a super class so join tables
  +                cldSuper = cld.getRepository().getDescriptorFor(cld.getSuperClass());
  +                appendSuperClassColumns(cld, cldSuper, stmt);
  +            }
  +
  +            stmt.append(" FROM ");
  +            appendTableWithJoins(getRootAlias(), where, stmt);
  +
  +            if (cld.getSuperClass() != null)
  +            {
  +                appendSuperClassJoin(cld, cldSuper, stmt, where);
  +            }
  +            
  +            appendWhereClause(where, whereCrit, stmt);
  +            appendGroupByClause(groupByFields, stmt);
  +            appendHavingClause(having, havingCrit, stmt);
  +        }
  +
  +        appendOrderByClause(orderByFields, columnList, stmt);
  +
  +        return stmt.toString();
  +    }
  +
  +    private void appendSuperClassJoin(ClassDescriptor cld, ClassDescriptor cldSuper, StringBuffer
stmt,
  +            StringBuffer where)
  +    {
  +        stmt.append(",");
  +        appendTable(cldSuper, stmt);
  +         
  +        if (where != null)
  +        {
  +            if (where.length() > 0)
  +            {
  +                where.append(" AND ");                
  +            }
  +            
  +            // get reference field in super class
  +            // TODO: do not use the superclassfield anymore, just assume that the id is
the same in both tables - @see PBroker.storeToDb
  +            int superFieldRef = cld.getSuperClassFieldRef();
  +            FieldDescriptor refField = cld.getFieldDescriptorByIndex(superFieldRef);
  +            
  +            appendTable(cldSuper, where);
  +            where.append(".");
  +            appendField(cldSuper.getAutoIncrementFields()[0], where);
  +            where.append(" = ");
  +            appendTable(cld, where);
  +            where.append(".");
  +            appendField(refField, where);
  +        }
  +    }
  +
  +    private void appendSuperClassColumns(ClassDescriptor cldSub, ClassDescriptor cldSuper,
StringBuffer buf)
  +    {
  +        FieldDescriptor[] fields = cldSuper.getFieldDescriptions();
  +        for (int i = 0; i < fields.length; i++)
  +        {
  +            FieldDescriptor field = fields[i];
  +            if (i > 0)
  +            {
  +                buf.append(",");
  +            }
  +            
  +            appendColumn(cldSuper.getFullTableName(), field.getColumnName(), buf);
  +        }
  +
  +    }
  +
  +}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message