Return-Path: 
 <torque-dev-return-10465-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-torque-dev-archive@www.apache.org
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AD9A879DD
	for <apmail-db-torque-dev-archive@www.apache.org>;
 Wed, 20 Jul 2011 18:58:55 +0000 (UTC)
Received: (qmail 70745 invoked by uid 500); 20 Jul 2011 18:58:54 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 69871 invoked by uid 500); 20 Jul 2011 18:58:53 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 69215 invoked by uid 500); 20 Jul 2011 18:58:52 -0000
Received: (qmail 69210 invoked by uid 99); 20 Jul 2011 18:58:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 18:58:52 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 18:58:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BFACE23888C2;
	Wed, 20 Jul 2011 18:58:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1148900 - in
 /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util:
 BasePeerImpl.java Criteria.java
Date: Wed, 20 Jul 2011 18:58:30 -0000
To: torque-commits@db.apache.org
From: tfischer@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110720185830.BFACE23888C2@eris.apache.org>

Author: tfischer
Date: Wed Jul 20 18:58:29 2011
New Revision: 1148900

URL: http://svn.apache.org/viewvc?rev=1148900&view=rev
Log:
TORQUE-165: remove cascade flag from Criteria

Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1148900&r1=1148899&r2=1148900&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Wed Jul 20 18:58:29 2011
@@ -306,48 +306,9 @@ public class BasePeerImpl implements Ser
                 Connection connection)
             throws TorqueException
     {
-//        String dbName = criteria.getDbName();
-//        final DatabaseMap dbMap = Torque.getDatabaseMap(dbName);
-
-        // This Callback adds all tables to the Table set which
-        // are referenced from a cascading criteria. As a result, all
-        // data that is referenced through foreign keys will also be
-        // deleted.
-//      TODO: reimplement
-//        SQLBuilder.TableCallback tc = new SQLBuilder.TableCallback() {
-//                public void process (Set<String> tables, String key, Criteria crit)
-//                {
-//                    if (crit.isCascade())
-//                    {
-//                        // This steps thru all the columns in the database.
-//                        TableMap[] tableMaps = dbMap.getTables();
-//                        for (int i = 0; i < tableMaps.length; i++)
-//                        {
-//                            ColumnMap[] columnMaps = tableMaps[i].getColumns();
-//
-//                            for (int j = 0; j < columnMaps.length; j++)
-//                            {
-//                                // Only delete rows where the foreign key is
-//                                // also a primary key.  Other rows need
-//                                // updating, but that is not implemented.
-//                                if (columnMaps[j].isForeignKey()
-//                                        && columnMaps[j].isPrimaryKey()
-//                                        && key.equals(columnMaps[j].getRelatedName()))
-//                                {
-//                                    tables.add(tableMaps[i].getName());
-//                                    crit.add(columnMaps[j].getFullyQualifiedName(),
-//                                            crit.getValue(key));
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//            };
-
         Query query = SqlBuilder.buildQuery(criteria);
-
         query.setType(Query.Type.DELETE);
-        
+
         String fullTableName = SqlBuilder.getFullTableName(
                 tableName,
                 criteria.getDbName());

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java?rev=1148900&r1=1148899&r2=1148900&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java Wed Jul 20 18:58:29 2011
@@ -144,9 +144,6 @@ public class Criteria implements Seriali
     /** Whether the result must be a single record. */
     private boolean singleRecord = false;
 
-    /** TODO Currently unused. */
-    private boolean cascade = false;
-
     /** List of modifiers like DISTICT. */
     private UniqueList<String> selectModifiers = new UniqueList<String>();
 
@@ -260,7 +257,6 @@ public class Criteria implements Seriali
         criterionMap.clear();
         ignoreCase = false;
         singleRecord = false;
-        cascade = false;
         selectModifiers.clear();
         selectColumns.clear();
         orderByColumns.clear();
@@ -1587,28 +1583,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Set cascade.
-     *
-     * @param b True if cascade is set.
-     * @return A modified Criteria object.
-     */
-    public Criteria setCascade(boolean b)
-    {
-        cascade = b;
-        return this;
-    }
-
-    /**
-     * Is cascade set?
-     *
-     * @return True if cascade is set.
-     */
-    public boolean isCascade()
-    {
-        return cascade;
-    }
-
-    /**
      * Set limit.
      *
      * @param limit An int with the value for limit.
@@ -1838,7 +1812,6 @@ public class Criteria implements Seriali
                 || this.limit != criteria.getLimit()
                 || ignoreCase != criteria.isIgnoreCase()
                 || singleRecord != criteria.isSingleRecord()
-                || cascade != criteria.isCascade()
                 || !dbName.equals(criteria.getDbName())
                 || !selectModifiers.equals(criteria.getSelectModifiers())
                 || !selectColumns.equals(criteria.getSelectColumns())
@@ -1882,7 +1855,6 @@ public class Criteria implements Seriali
         result = 37 * result + limit;
         result = 37 * result + (ignoreCase ? 0 : 1);
         result = 37 * result + (singleRecord ? 0 : 1);
-        result = 37 * result + (cascade ? 0 : 1);
         result = 37 * result + dbName.hashCode();
         result = 37 * result + selectModifiers.hashCode();
         result = 37 * result + selectColumns.hashCode();



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