arminw | 3 Oct 2006 01:36
Picon
Favicon

svn commit: r452264 - in /db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb: broker/PathTest.java broker/QueryTest.java odmg/LockingMultithreadedTest.java

Author: arminw
Date: Mon Oct  2 16:36:55 2006
New Revision: 452264

URL: http://svn.apache.org/viewvc?view=rev&rev=452264
Log:
fix, cleanup tests

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/PathTest.java
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/QueryTest.java
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingMultithreadedTest.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/PathTest.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/PathTest.java?view=diff&rev=452264&r1=452263&r2=452264
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/PathTest.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/PathTest.java Mon Oct  2
16:36:55 2006
 <at>  <at>  -9,20 +9,24  <at>  <at> 
 import java.util.Collection;
 import java.util.Iterator;

-import junit.framework.TestCase;
+import org.apache.commons.lang.SystemUtils;
 import org.apache.ojb.broker.query.Criteria;
 import org.apache.ojb.broker.query.Query;
 import org.apache.ojb.broker.query.QueryByCriteria;
 import org.apache.ojb.broker.query.QueryFactory;
 import org.apache.ojb.broker.query.UserAlias;
(Continue reading)

arminw | 3 Oct 2006 01:46
Picon
Favicon

svn commit: r452266 - in /db/ojb/trunk/src/test/org/apache/ojb: broker/PathTest.java broker/QueryTest.java odmg/LockingMultithreadedTest.java

Author: arminw
Date: Mon Oct  2 16:46:16 2006
New Revision: 452266

URL: http://svn.apache.org/viewvc?view=rev&rev=452266
Log:
fix, cleanup tests

Modified:
    db/ojb/trunk/src/test/org/apache/ojb/broker/PathTest.java
    db/ojb/trunk/src/test/org/apache/ojb/broker/QueryTest.java
    db/ojb/trunk/src/test/org/apache/ojb/odmg/LockingMultithreadedTest.java

Modified: db/ojb/trunk/src/test/org/apache/ojb/broker/PathTest.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/broker/PathTest.java?view=diff&rev=452266&r1=452265&r2=452266
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/broker/PathTest.java (original)
+++ db/ojb/trunk/src/test/org/apache/ojb/broker/PathTest.java Mon Oct  2 16:46:16 2006
 <at>  <at>  -228,362 +228,290  <at>  <at> 
 	 */
 	public void testPathClassOnSegment1() throws Exception
 	{
-        try
-		{
-			// c1 criteria 
-			Criteria crit1 = new Criteria();
-			crit1.addEqualTo("cSet.c1Attrib", new Integer("10001"));
-			crit1.addPathClass("cSet", C1.class);
-			
-			Query query = QueryFactory.newQuery(B.class, crit1);
(Continue reading)

arminw | 3 Oct 2006 01:55
Picon
Favicon

svn commit: r452267 - in /db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence: DatabaseIdentityHsqlTest.java DatabaseIdentityMaxDBTest.java DatabaseIdentityMySqlTest.java DatabaseIdentityTest.java

Author: arminw
Date: Mon Oct  2 16:55:13 2006
New Revision: 452267

URL: http://svn.apache.org/viewvc?view=rev&rev=452267
Log:
fix, cleanup tests

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityMaxDBTest.java
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityMySqlTest.java
    db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityTest.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java?view=diff&rev=452267&r1=452266&r2=452267
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java (original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java
Mon Oct  2 16:55:13 2006
 <at>  <at>  -37,7 +37,6  <at>  <at> 

     protected void initDBDependend() throws Exception
     {
-        databaseName = "Hsql";
         dropConstraintMainTable = "ALTER TABLE NATIVE_MAIN_OBJECT DROP CONSTRAINT MAIN_REF_FK";
         createMainTable = "CREATE TABLE NATIVE_MAIN_OBJECT(NATIVE_ID IDENTITY NOT NULL PRIMARY KEY, REF_ID
int,NAME VARCHAR(250))";
(Continue reading)

arminw | 3 Oct 2006 01:55
Picon
Favicon

svn commit: r452268 - in /db/ojb/trunk/src/test/org/apache/ojb/broker/sequence: DatabaseIdentityHsqlTest.java DatabaseIdentityMaxDBTest.java DatabaseIdentityMySqlTest.java DatabaseIdentityTest.java

Author: arminw
Date: Mon Oct  2 16:55:46 2006
New Revision: 452268

URL: http://svn.apache.org/viewvc?view=rev&rev=452268
Log:
fix, cleanup tests

Modified:
    db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java
    db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityMaxDBTest.java
    db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityMySqlTest.java
    db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityTest.java

Modified: db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java?view=diff&rev=452268&r1=452267&r2=452268
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java (original)
+++ db/ojb/trunk/src/test/org/apache/ojb/broker/sequence/DatabaseIdentityHsqlTest.java Mon
Oct  2 16:55:46 2006
 <at>  <at>  -37,7 +37,6  <at>  <at> 

     protected void initDBDependend() throws Exception
     {
-        databaseName = "Hsql";
         dropConstraintMainTable = "ALTER TABLE NATIVE_MAIN_OBJECT DROP CONSTRAINT MAIN_REF_FK";
         createMainTable = "CREATE TABLE NATIVE_MAIN_OBJECT(NATIVE_ID IDENTITY NOT NULL PRIMARY KEY, REF_ID
int,NAME VARCHAR(250))";
         createRefTable = "CREATE TABLE NATIVE_REFERENCE_OBJECT (NATIVE_ID IDENTITY NOT NULL PRIMARY KEY," +
 <at>  <at>  -49,5 +48,10  <at>  <at> 
(Continue reading)

arminw | 3 Oct 2006 01:57
Picon
Favicon

svn commit: r452270 - in /db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms: Platform.java PlatformDefaultImpl.java PlatformSapdbImpl.java

Author: arminw
Date: Mon Oct  2 16:57:26 2006
New Revision: 452270

URL: http://svn.apache.org/viewvc?view=rev&rev=452270
Log:
add method to check whether or not ORDER BY clause is allowed in sub-select

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/Platform.java
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/PlatformDefaultImpl.java
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/PlatformSapdbImpl.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/Platform.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/Platform.java?view=diff&rev=452270&r1=452269&r2=452270
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/Platform.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/platforms/Platform.java
Mon Oct  2 16:57:26 2006
 <at>  <at>  -241,6 +241,13  <at>  <at> 
      *  <at> return <code>true</code> if it is supported
      */
     boolean supportsMultiColumnCountDistinct();
+
+    /**
+     * Whether the platform supports a ORDER BY clause in SUB-SELECT statements.
+     *
+     *  <at> return <code>true</code> if it is supported
+     */
+    boolean supportsOrderByInSubSelect();
(Continue reading)

arminw | 3 Oct 2006 01:58
Picon
Favicon

svn commit: r452271 - in /db/ojb/trunk/src/java/org/apache/ojb/broker/platforms: Platform.java PlatformDefaultImpl.java PlatformSapdbImpl.java

Author: arminw
Date: Mon Oct  2 16:58:43 2006
New Revision: 452271

URL: http://svn.apache.org/viewvc?view=rev&rev=452271
Log:
add method to check whether or not ORDER BY clause is allowed in sub-select

Modified:
    db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/Platform.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/PlatformDefaultImpl.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/PlatformSapdbImpl.java

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/Platform.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/Platform.java?view=diff&rev=452271&r1=452270&r2=452271
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/Platform.java (original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/platforms/Platform.java Mon Oct  2 16:58:43 2006
 <at>  <at>  -45,13 +45,15  <at>  <at> 

     /**
      * Called by { <at> link org.apache.ojb.broker.accesslayer.StatementManager} implementation
-     * before invoking <tt>stmt.close()</tt> method.
+     * on resource cleanup (result and statement instances) before closing the
+     * { <at> link java.sql.Statement} instance (nevertheless the statement can be <em>null</em>).
      */
     public void beforeStatementClose(Statement stmt, ResultSet rs) throws PlatformException;

     /**
      * Called by { <at> link org.apache.ojb.broker.accesslayer.StatementManager} implementation
(Continue reading)

arminw | 3 Oct 2006 02:00
Picon
Favicon

svn commit: r452272 - /db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java

Author: arminw
Date: Mon Oct  2 17:00:25 2006
New Revision: 452272

URL: http://svn.apache.org/viewvc?view=rev&rev=452272
Log:
initial version, specific class for sub-select

Added:
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java

Added: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java?view=auto&rev=452272
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java (added)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java
Mon Oct  2 17:00:25 2006
 <at>  <at>  -0,0 +1,54  <at>  <at> 
+package org.apache.ojb.broker.accesslayer.sql;
+
+/* Copyright 2002-2006 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
+ *
(Continue reading)

arminw | 3 Oct 2006 02:01
Picon
Favicon

svn commit: r452273 - /db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java

Author: arminw
Date: Mon Oct  2 17:01:13 2006
New Revision: 452273

URL: http://svn.apache.org/viewvc?view=rev&rev=452273
Log:
initial version, specific class for sub-select

Added:
    db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java

Added: db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java?view=auto&rev=452273
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java (added)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSubSelectStatement.java
Mon Oct  2 17:01:13 2006
 <at>  <at>  -0,0 +1,54  <at>  <at> 
+package org.apache.ojb.broker.accesslayer.sql;
+
+/* Copyright 2002-2006 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,
(Continue reading)

arminw | 3 Oct 2006 02:02
Picon
Favicon

svn commit: r452274 - /db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java

Author: arminw
Date: Mon Oct  2 17:02:08 2006
New Revision: 452274

URL: http://svn.apache.org/viewvc?view=rev&rev=452274
Log:
use sub-select class when build sub-select, code cleanup

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java?view=diff&rev=452274&r1=452273&r2=452274
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java (original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
Mon Oct  2 17:02:08 2006
 <at>  <at>  -187,8 +187,7  <at>  <at> 
      */
     protected AttributeInfo getAttributeInfo(String attr, boolean useOuterJoins, UserAlias
aUserAlias, Map pathClasses)
     {
-        AttributeInfo result = new AttributeInfo(attr);
-
+        AttributeInfo result;
         StringTokenizer st = SqlHelper.tokenizeAttribute(attr);
         result = new AttributeInfo(attr);

(Continue reading)

arminw | 3 Oct 2006 02:03
Picon
Favicon

svn commit: r452275 - /db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java

Author: arminw
Date: Mon Oct  2 17:03:34 2006
New Revision: 452275

URL: http://svn.apache.org/viewvc?view=rev&rev=452275
Log:
use sub-select class when build sub-select

Modified:
    db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java?view=diff&rev=452275&r1=452274&r2=452275
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java (original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java Mon
Oct  2 17:03:34 2006
 <at>  <at>  -1008,7 +1008,7  <at>  <at> 
         }
         else
         {
-            sql = new SqlSelectStatement(this, getPlatform(), cld, subQuery, getLogger()).getStatement();
+            sql = new SqlSubSelectStatement(this, getPlatform(), cld, subQuery, getLogger()).getStatement();
         }

         return sql;

Gmane