Project WONDER

Revision: 11930
          http://wonder.svn.sourceforge.net/wonder/?rev=11930&view=rev
Author:   nullterminated
Date:     2011-01-29 14:12:22 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
trunk merge

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java	2011-01-29 14:00:05 UTC (rev 11929)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java	2011-01-29 14:12:22 UTC (rev 11930)
@@ -2193,41 +2193,6 @@
 		public int varcharLargeColumnWidth() {
 			return -1;
 		}
-		
-		@Override
-		public boolean handleDatabaseException(EODatabaseContext databaseContext, Throwable throwable) {
-			if(throwable instanceof EOGeneralAdaptorException) {
-				EOGeneralAdaptorException e = (EOGeneralAdaptorException)throwable;
-				NSDictionary userInfo = e.userInfo();
-				EOAdaptorOperation failedOp = userInfo==null?null:(EOAdaptorOperation)userInfo.objectForKey(EOAdaptorChannel.FailedAdaptorOperationKey);
-				if(failedOp != null && failedOp.exception() instanceof JDBCAdaptorException) {
-					JDBCAdaptorException ae = (JDBCAdaptorException)failedOp.exception();
-					
-					// MySQL error codes: http://dev.mysql.com/doc/refman/5.0/en/error-messages-server.html
-					switch(ae.sqlException().getErrorCode()) {
-					
-					case 1062: //Violates unique constraint
-						handleUniqueConstraintAdaptorException(databaseContext, failedOp);
-						break;
-						
-					default:
-						
-					}
-				}
-			}
-			return false;
-		}
-	
-		/**
-		 * Throws a validation exception for a unique constraint failure.
-		 * @param context The database context
-		 * @param failedOp The operation that failed
-		 * @throws NSValidation.ValidationException The exception thrown. The key for the validation template strings file is <code>UniqueConstraintException</code>
-		 */
-		protected void handleUniqueConstraintAdaptorException(EODatabaseContext context, EOAdaptorOperation failedOp) throws NSValidation.ValidationException {
-			NSValidation.ValidationException ve = ERXValidationFactory.defaultFactory().createCustomException(null, "UniqueConstraintException");
-			throw ve;
-		}
 	}
 
 	public static class PostgresqlSQLHelper extends ERXSQLHelper {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11929
          http://wonder.svn.sourceforge.net/wonder/?rev=11929&view=rev
Author:   nullterminated
Date:     2011-01-29 14:00:05 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
http://issues.objectstyle.org/jira/browse/WONDER-664

Modified Paths:
--------------
    trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java	2011-01-28 23:02:09 UTC (rev 11928)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java	2011-01-29 14:00:05 UTC (rev 11929)
@@ -2193,41 +2193,6 @@
 		public int varcharLargeColumnWidth() {
 			return -1;
 		}
-		
-		@Override
-		public boolean handleDatabaseException(EODatabaseContext databaseContext, Throwable throwable) {
-			if(throwable instanceof EOGeneralAdaptorException) {
-				EOGeneralAdaptorException e = (EOGeneralAdaptorException)throwable;
-				NSDictionary userInfo = e.userInfo();
-				EOAdaptorOperation failedOp = userInfo==null?null:(EOAdaptorOperation)userInfo.objectForKey(EOAdaptorChannel.FailedAdaptorOperationKey);
-				if(failedOp != null && failedOp.exception() instanceof JDBCAdaptorException) {
-					JDBCAdaptorException ae = (JDBCAdaptorException)failedOp.exception();
-					
-					// MySQL error codes: http://dev.mysql.com/doc/refman/5.0/en/error-messages-server.html
-					switch(ae.sqlException().getErrorCode()) {
-					
-					case 1062: //Violates unique constraint
-						handleUniqueConstraintAdaptorException(databaseContext, failedOp);
-						break;
-						
-					default:
-						
-					}
-				}
-			}
-			return false;
-		}
-	
-		/**
-		 * Throws a validation exception for a unique constraint failure.
-		 * @param context The database context
-		 * @param failedOp The operation that failed
-		 * @throws NSValidation.ValidationException The exception thrown. The key for the validation template strings file is <code>UniqueConstraintException</code>
-		 */
-		protected void handleUniqueConstraintAdaptorException(EODatabaseContext context, EOAdaptorOperation failedOp) throws NSValidation.ValidationException {
-			NSValidation.ValidationException ve = ERXValidationFactory.defaultFactory().createCustomException(null, "UniqueConstraintException");
-			throw ve;
-		}
 	}
 
 	public static class PostgresqlSQLHelper extends ERXSQLHelper {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11928
          http://wonder.svn.sourceforge.net/wonder/?rev=11928&view=rev
Author:   bob_schwarzmann
Date:     2011-01-28 23:02:09 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Merged revisions 11917 via svnmerge from 
https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_2_0_0_Branch/Wonder

........
  r11917 | tcripps | 2011-01-26 11:37:10 -0800 (Wed, 26 Jan 2011) | 1 line
  
  Fixed a misplaced </webobject> tag that was causing extra cells in the attribute repetition.
........

Modified Paths:
--------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html

Property Changed:
----------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/ERCoolComponents/
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin/
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/Wonder_2_0_0_Branch/Wonder:1-11872,11893-11894,11922
   + /branches/Wonder_2_0_0_Branch/Wonder:1-11927
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
   + /branches/Wonder_2_0_0_Branch/Wonder:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/ERCoolComponents
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Ajax/ERCoolComponents:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/ERCoolComponents:11280-11857
/trunk/Wonder/Frameworks/Ajax/ERCoolComponents:11216-11279
   + /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Ajax/ERCoolComponents:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/ERCoolComponents:11280-11857
/trunk/Wonder/Frameworks/Ajax/ERCoolComponents:11216-11279


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-2738
/branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11284,11342,11344,11348,11353-11354
/trunk/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-7709
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:7710-11503
   + /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-2738
/branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11284,11342,11344,11348,11353-11354
/trunk/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-7709
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:7710-11503


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-2738
/branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:10717-10770
/branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11284,11342,11344,11348,11353-11354
/trunk/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-7655
/trunk/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:7656-7709
/trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:7710-11485
   + /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-2738
/branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:10717-10770
/branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11284,11342,11344,11348,11353-11354
/trunk/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-7655
/trunk/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:7656-7709
/trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:7710-11485

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2011-01-28 22:53:36 UTC (rev 11927)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2011-01-28 23:02:09 UTC (rev 11928)
@@ -124,6 +124,7 @@
 					</webobject>
 				</webobject>
 				</webobject>
+				</webobject>
 				<webobject name="IfNotHasDeleteWidgetPropertyKey">
 				<td>
 					<webobject name="IsListing">
@@ -133,7 +134,6 @@
 					</webobject>
 				</td>
 				</webobject>
-				</webobject>
 			</webobject>
 			<tr>
 				<td bgcolor="#ffffff" colspan='<webobject name="ColSpanNumber"></webobject>'><img border="0" height="2" width="1" /></td>


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernDefaultSkin:10824-11279
   + /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernDefaultSkin:10824-11279


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernDirectToWeb:10824-11279
   + /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernDirectToWeb:10824-11279


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernLook:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernLook:10824-11279
   + /branches/Wonder_2_0_0_Branch/Wonder/Frameworks/D2W/ERModernLook:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998,11004,11008-11088,11091-11158,11245-11266,11276-11538,11546-11715,11723-11780,11786-11787,11789-11794,11802,11812,11820-11822,11826,11856,11859-11860,11863,11870-11871,11917
/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook:11280-11858
/trunk/Wonder/Frameworks/D2W/ERModernLook:10824-11279


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11927
          http://wonder.svn.sourceforge.net/wonder/?rev=11927&view=rev
Author:   bob_schwarzmann
Date:     2011-01-28 22:53:36 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Recorded merge of revisions 11922 via svnmerge from 
https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_2_0_0_Branch/Wonder

........
  r11922 | marroz | 2011-01-27 12:08:08 -0800 (Thu, 27 Jan 2011) | 3 lines
  
  Add raw row support for arbitrary columns.
  Fixed bugs.
  Changed class and method names to shorter, better ones.
........

Property Changed:
----------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/


Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/Wonder_2_0_0_Branch/Wonder:1-11872,11893-11894
   + /branches/Wonder_2_0_0_Branch/Wonder:1-11872,11893-11894,11922


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11926
          http://wonder.svn.sourceforge.net/wonder/?rev=11926&view=rev
Author:   davidleber
Date:     2011-01-28 14:25:12 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Added mime type details for mp3, m4a, and wav

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/Resources/Properties

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/Resources/Properties
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/Resources/Properties	2011-01-28 14:13:24 UTC (rev 11925)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/Resources/Properties	2011-01-28 14:25:12 UTC (rev 11926)
@@ -1,12 +1,24 @@
 ERAttachment.MigrationClassPrefix=er.attachment.migrations.ERAttachment
 
-er.attachment.mimeTypes=image/bmp,image/eps,image/gif,image/jp2,image/jpeg,application/pdf,image/pict,image/png,image/psd,image/raw,image/tiff,image/x-pict,text/css,text/plain,text/html,text/xml,text/x-diff,application/zip,application/x-tar,application/x-gzip,application/x-octet-stream,video/quicktime,application/guitar-pro3,application/guitar-pro4,application/guitar-pro5
+er.attachment.mimeTypes=audio/mpeg,audio/mp4,audio/x-wav,image/bmp,image/eps,image/gif,image/jp2,image/jpeg,application/pdf,image/pict,image/png,image/psd,image/raw,image/tiff,image/x-pict,text/css,text/plain,text/html,text/xml,text/x-diff,application/zip,application/x-tar,application/x-gzip,application/x-octet-stream,video/quicktime,application/guitar-pro3,application/guitar-pro4,application/guitar-pro5
 
 er.attachment.mimeType.video/quicktime.viewer=er.attachment.components.viewers.ERAttachmentQuickTimeViewer
 er.attachment.mimeType.image/*.viewer=er.attachment.components.viewers.ERAttachmentImageViewer
 er.attachment.mimeType.default.viewer=er.attachment.components.viewers.ERAttachmentDefaultViewer
 er.attachment.mimeType.unavailable.viewer=er.attachment.components.viewers.ERAttachmentUnavailableViewer
 
+er.attachment.mimeType.audio/mpeg.name=MP3
+er.attachment.mimeType.audio/mpeg.uti=public.mp3
+er.attachment.mimeType.audio/mpeg.extensions=mp3
+
+er.attachment.mimeType.audio/mp4.name=M4A
+er.attachment.mimeType.audio/mp4.uti=public.mpeg-4-audio
+er.attachment.mimeType.audio/mp4.extensions=m4a
+
+er.attachment.mimeType.audio/x-wav.name=WAV
+er.attachment.mimeType.audio/x-wav.uti=com.microsoft.waveform-audio
+er.attachment.mimeType.audio/x-wav.extensions=wav
+
 er.attachment.mimeType.image/bmp.name=BMP
 er.attachment.mimeType.image/bmp.uti=public.bmp
 er.attachment.mimeType.image/bmp.extensions=bmp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11925
          http://wonder.svn.sourceforge.net/wonder/?rev=11925&view=rev
Author:   davidleber
Date:     2011-01-28 14:13:24 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Duplicated and renamed wav.png to x-wav.png, and mp3.png to mpeg.png to correspond to their mime types so ERAttachmentIcon will find them.

Added Paths:
-----------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/mpeg.png
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/x-wav.png
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/mpeg.png
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/x-wav.png
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/mpeg.png
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/x-wav.png

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/mpeg.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/mpeg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/x-wav.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/16/audio/x-wav.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/mpeg.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/mpeg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/x-wav.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/32/audio/x-wav.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/mpeg.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/mpeg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/x-wav.png
===================================================================
(Binary files differ)


Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/BusinessLogic/ERAttachment/WebServerResources/icons/64/audio/x-wav.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11924
          http://wonder.svn.sourceforge.net/wonder/?rev=11924&view=rev
Author:   nullterminated
Date:     2011-01-28 03:59:44 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Removal of reimplemented EOAttribute and custom date attribute support in ERXJDBCColumn. Will move these changes into another framework.

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/jdbcadaptor/ERXJDBCColumn.java

Removed Paths:
-------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/EOAttribute.java

Deleted: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/EOAttribute.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/EOAttribute.java	2011-01-27 20:09:38 UTC (rev 11923)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/EOAttribute.java	2011-01-28 03:59:44 UTC (rev 11924)
@@ -1,1812 +0,0 @@
-package com.webobjects.eoaccess;
-
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TimeZone;
-
-import com.webobjects.foundation.NSArray;
-import com.webobjects.foundation.NSData;
-import com.webobjects.foundation.NSDictionary;
-import com.webobjects.foundation.NSForwardException;
-import com.webobjects.foundation.NSKeyValueCoding;
-import com.webobjects.foundation.NSLog;
-import com.webobjects.foundation.NSMutableArray;
-import com.webobjects.foundation.NSMutableDictionary;
-import com.webobjects.foundation.NSRange;
-import com.webobjects.foundation.NSSelector;
-import com.webobjects.foundation.NSTimestamp;
-import com.webobjects.foundation._NSStringUtilities;
-import com.webobjects.foundation._NSUtilities;
-
-public class EOAttribute extends EOProperty implements EOPropertyListEncoding, EOSQLExpression.SQLValue {
-
-	enum Characteristic {
-		ExternalType("externalType"), ColumnName("columnName"), ReadOnly("readOnly"), ClassName("className"), ValueType("valueType"), Width("width"), Precision("precision"), Scale("scale"), WriteFormat("writeFormat"), ReadFormat("readFormat"), UserInfo("userInfo"), ServerTimeZone("serverTimeZone"), ValueFactoryClassName("valueFactoryClassName"), ValueFactoryMethodName("valueFactoryMethodName"), AdaptorValueConversionClassName("adaptorValueConversionClassName"), AdaptorValueConversionMethodName("adaptorValueConversionMethodName"), FactoryMethodArgumentType("factoryMethodArgumentType"), AllowsNull("allowsNull"), ParameterDirection("parameterDirection"), InternalInfo("_internalInfo");
-
-		private String _externalName;
-
-		Characteristic(String externalName) {
-			this._externalName = externalName;
-		}
-
-		public String externalName() {
-			return _externalName;
-		}
-
-		public static Characteristic characteristicForName(String value) {
-			String lower = value.toLowerCase();
-			for (Characteristic c : values()) {
-				if (c.externalName().equalsIgnoreCase(lower)) {
-					return c;
-				}
-			}
-			return null;
-		}
-	}
-
-	public synchronized Map overwrittenCharacteristics() {
-		if (_overwrittenCharacteristics == null) {
-			Map list = new HashMap();
-			for (Characteristic c : Characteristic.values()) {
-				list.put(c, Boolean.FALSE);
-			}
-			_overwrittenCharacteristics = list;
-		}
-		return _overwrittenCharacteristics;
-	}
-
-	protected void _setOverrideForCharacteristic(Characteristic key) {
-		overwrittenCharacteristics().put(key, Boolean.TRUE);
-	}
-
-	public boolean overridesPrototypeDefinitionForCharacteristic(Characteristic key) {
-		Boolean value = (Boolean) overwrittenCharacteristics().get(key);
-		return value == null ? false : value.booleanValue();
-	}
-
-	public void _updateFromPrototype() {
-		if (_prototype == null)
-			return;
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ExternalType))
-			_setExternalType(_prototype.externalType());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ColumnName))
-			_setColumnName(_prototype.columnName());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ReadOnly))
-			_setReadOnly(_prototype.isReadOnly());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ClassName))
-			_setClassName(_prototype.className());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ValueType))
-			_setValueType(_prototype.valueType());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.Width))
-			_setWidth(_prototype.width());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.Precision))
-			_setPrecision(_prototype.precision());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.Scale))
-			_setScale(_prototype.scale());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.WriteFormat))
-			_setWriteFormat(_prototype.writeFormat());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ReadFormat))
-			_setReadFormat(_prototype.readFormat());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ServerTimeZone))
-			_setServerTimeZone(_prototype.serverTimeZone());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ValueFactoryClassName))
-			_setValueFactoryClassName(_prototype.valueFactoryClassName());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ValueFactoryMethodName))
-			_setValueFactoryMethodName(_prototype.valueFactoryMethodName());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.AdaptorValueConversionClassName))
-			_setAdaptorValueConversionClassName(_prototype.adaptorValueConversionClassName());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.AdaptorValueConversionMethodName))
-			_setAdaptorValueConversionMethodName(_prototype.adaptorValueConversionMethodName());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.FactoryMethodArgumentType))
-			_setFactoryMethodArgumentType(_prototype.factoryMethodArgumentType());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.AllowsNull))
-			_setAllowsNull(_prototype.allowsNull());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.ParameterDirection))
-			_setParameterDirection(_prototype.parameterDirection());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.UserInfo))
-			if (_prototype.userInfo() != null)
-				_setUserInfo(_prototype.userInfo().immutableClone());
-			else
-				_setUserInfo(NSDictionary.emptyDictionary());
-		if (!overridesPrototypeDefinitionForCharacteristic(Characteristic.InternalInfo))
-			if (_prototype._internalInfo() != null)
-				__setInternalInfo(_prototype._internalInfo().immutableClone());
-			else
-				__setInternalInfo(NSDictionary.emptyDictionary());
-	}
-
-	public void _resetPrototype() {
-		if (_prototypeName != null) {
-			_prototype = null;
-			prototype();
-		}
-	}
-
-	protected boolean _hasAnyOverrides() {
-		boolean result = false;
-		for (Iterator i = overwrittenCharacteristics().values().iterator(); i.hasNext();) {
-			Boolean anEnum = (Boolean) i.next();
-			result |= anEnum.booleanValue();
-		}
-
-		return result;
-	}
-
-	public EOAttribute() {
-		_flags_isNonUpdateable = false;
-		_flags_isNonUpdateableInitialized = false;
-		_flags_allowsNull = true;
-		_adaptorValueType = -1;
-		_valueTypeClassName = "";
-	}
-
-	public String name() {
-		return _name;
-	}
-
-	public String toString() {
-		return _toString(0);
-	}
-
-	public String _toString(int indent) {
-		String indentString = "";
-		for (int i = 0; i < indent; i++)
-			indentString = (new StringBuilder()).append(indentString).append("\t").toString();
-
-		StringBuilder aLog = new StringBuilder();
-		aLog.append((new StringBuilder()).append(indentString).append("<EOAttribute ").append(name()).append("\n").toString());
-		String aKey = "";
-		try {
-			NSMutableDictionary aDictionary = new NSMutableDictionary();
-			encodeIntoPropertyList(aDictionary);
-			for (Enumeration enumerator = aDictionary.keyEnumerator(); enumerator.hasMoreElements(); aLog.append((new StringBuilder()).append(indentString).append("\t").append(aKey).append(" : '").append(aDictionary.objectForKey(aKey)).append("'\n").toString()))
-				aKey = (String) enumerator.nextElement();
-
-		}
-		catch (Exception exception) {
-			aLog.append((new StringBuilder()).append(indentString).append("\t").append(getClass().getName()).append(".toString: characteristics ").append(aKey).append(" exception ").append(exception).append("\n").toString());
-		}
-		aLog.append((new StringBuilder()).append(indentString).append(">").toString());
-		return aLog.toString();
-	}
-
-	public EOEntity entity() {
-		return _parent;
-	}
-
-	public EOStoredProcedure storedProcedure() {
-		return _parentStoredProcedure;
-	}
-
-	public Object parent() {
-		if (_parent != null)
-			return _parent;
-
-		return _parentStoredProcedure;
-	}
-
-	private EOModel _parentModel() {
-		if (_parent != null)
-			return _parent.model();
-		if (_parentStoredProcedure != null)
-			return _parentStoredProcedure.model();
-
-		return null;
-	}
-
-	private void _parent_setIsEdited() {
-		if (_parent != null)
-			_parent._setIsEdited();
-		else if (_parentStoredProcedure != null)
-			_parentStoredProcedure._setIsEdited();
-	}
-
-	private NSArray _parent_primaryKeyAttributes() {
-		if (_parent != null)
-			return _parent.primaryKeyAttributes();
-
-		return null;
-	}
-
-	private EOAttribute _parent_attributeNamed(String name) {
-		if (_parent != null)
-			return _parent.attributeNamed(name);
-
-		return null;
-	}
-
-	private void _parent_removeAttribute(EOAttribute att) {
-		if (_parent != null)
-			_parent.removeAttribute(att);
-	}
-
-	public String prototypeName() {
-		return _prototypeName;
-	}
-
-	public EOAttribute prototype() {
-		if (_prototype == null && _prototypeName != null)
-			if (_parent != null)
-				_prototype = _parent.model().prototypeAttributeNamed(_prototypeName);
-			else if (_parentStoredProcedure != null)
-				_prototype = _parentStoredProcedure.model().prototypeAttributeNamed(_prototypeName);
-		return _prototype;
-	}
-
-	public String externalType() {
-		return _externalType;
-	}
-
-	public String columnName() {
-		return _columnName;
-	}
-
-	public String definition() {
-		return _definitionArray == null ? null : _definitionArray.valueForSQLExpression(null);
-	}
-
-	public boolean isFlattened() {
-		if (_definitionArray == null)
-			return false;
-		int count;
-		if ((count = _definitionArray.count()) < 2)
-			return false;
-		for (int index = 0; index < count - 1; index++) {
-			Object property = _definitionArray.objectAtIndex(index);
-			if (!(property instanceof EORelationship))
-				return false;
-		}
-
-		return _definitionArray.lastObject() instanceof EOAttribute;
-	}
-
-	public boolean isDerived() {
-		return _definitionArray != null;
-	}
-
-	public boolean isReadOnly() {
-		return _flags_isReadOnly || isDerived() && !isFlattened();
-	}
-
-	public boolean _isPrimaryKeyClassProperty() {
-		NSArray pkAtts = _parent_primaryKeyAttributes();
-		if (pkAtts == null)
-			return false;
-		if (!pkAtts.containsObject(this))
-			return false;
-
-		return _parent.classProperties().containsObject(this);
-	}
-
-	public boolean _isNonUpdateable() {
-		if (_flags_isNonUpdateableInitialized) {
-			return _flags_isNonUpdateable;
-		}
-		_flags_isNonUpdateable = isReadOnly() || _isPrimaryKeyClassProperty();
-		_flags_isNonUpdateableInitialized = true;
-		return _flags_isNonUpdateable;
-	}
-
-	/**
-	 * @return valueClassName
-	 * @deprecated Method valueClassName is deprecated
-	 */
-
-	public String valueClassName() {
-		return _valueClassName;
-	}
-
-	public String className() {
-		return _className;
-	}
-
-	public String valueType() {
-		return _valueType;
-	}
-
-	protected char _valueTypeChar() {
-		if (_valueType != null && _valueType.length() == 1)
-			return _valueType.charAt(0);
-
-		return _VTUnknown;
-	}
-
-	public int width() {
-		return _width;
-	}
-
-	public int precision() {
-		return _precision;
-	}
-
-	public int scale() {
-		return _scale;
-	}
-
-	public boolean allowsNull() {
-		return _flags_allowsNull;
-	}
-
-	public String readFormat() {
-		return _readFormat;
-	}
-
-	public String writeFormat() {
-		return _writeFormat;
-	}
-
-	public int parameterDirection() {
-		return _parameterDirection;
-	}
-
-	public NSDictionary userInfo() {
-		return _userInfo;
-	}
-
-	public NSDictionary _internalInfo() {
-		return _internalInfo;
-	}
-
-	public EOAttribute(NSDictionary plist, Object owner) {
-		_flags_isNonUpdateable = false;
-		_flags_isNonUpdateableInitialized = false;
-		_name = (String) plist.objectForKey("name");
-		_adaptorValueType = -1;
-		_valueTypeClassName = "";
-		setParent(owner);
-		String string;
-		if ((string = (String) plist.objectForKey("prototypeName")) != null)
-			setPrototype(_parentModel().prototypeAttributeNamed(string));
-		if ((string = (String) plist.objectForKey("externalType")) != null)
-			setExternalType(string);
-		if ((string = (String) plist.objectForKey("isReadOnly")) != null)
-			setReadOnly(string.equals("Y"));
-		if ((string = (String) plist.objectForKey("allowsNull")) != null || _prototypeName == null)
-			setAllowsNull(string != null && string.equals("Y"));
-		if ((string = (String) plist.objectForKey("valueType")) != null)
-			setValueType(string);
-		if ((string = (String) plist.objectForKey("valueClassName")) != null)
-			setValueClassName(string);
-		if ((string = (String) plist.objectForKey("className")) != null)
-			setClassName(string);
-		string = (String) plist.objectForKey("writeFormat");
-		if (string == null) {
-			string = (String) plist.objectForKey("updateFormat");
-			if (string == null)
-				string = (String) plist.objectForKey("insertFormat");
-		}
-		if (string != null)
-			setWriteFormat(string);
-		string = (String) plist.objectForKey("readFormat");
-		if (string == null)
-			string = (String) plist.objectForKey("selectFormat");
-		if (string != null)
-			setReadFormat(string);
-		int num = _NSStringUtilities.integerFromPlist(plist, "maximumLength", -1);
-		if (num == -1)
-			num = _NSStringUtilities.integerFromPlist(plist, "width", -1);
-		if (num != -1)
-			setWidth(num);
-		if ((string = (String) plist.objectForKey("factoryMethodArgumentType")) != null)
-			_argumentType = _factoryMethodArgumentTypeFromString(string);
-		if ((string = (String) plist.objectForKey("adaptorValueConversionClassName")) != null)
-			setAdaptorValueConversionClassName(string);
-		if ((string = (String) plist.objectForKey("adaptorValueConversionMethodName")) != null)
-			setAdaptorValueConversionMethodName(string);
-		if ((string = (String) plist.objectForKey("valueFactoryClassName")) != null)
-			setValueFactoryClassName(string);
-		if ((string = (String) plist.objectForKey("valueFactoryMethodName")) != null)
-			setValueFactoryMethodName(string);
-		num = _NSStringUtilities.integerFromPlist(plist, "precision", -1);
-		if (num != -1)
-			setPrecision(num);
-		num = _NSStringUtilities.integerFromPlist(plist, "scale", -1);
-		if (num != -1)
-			setScale(num);
-		if (_width == 0 && _externalType != null) {
-			int leftParen = _externalType.indexOf("(");
-			if (leftParen != -1) {
-				int rightParen = _externalType.indexOf(")");
-				if (rightParen != -1) {
-					String sizeString = _externalType.substring(leftParen + 1, rightParen);
-					int max;
-					try {
-						max = Integer.parseInt(sizeString);
-					}
-					catch (NumberFormatException e) {
-						NSLog._conditionallyLogPrivateException(e);
-						max = 0;
-					}
-					if (max != 0) {
-						setWidth(max);
-						setExternalType(_externalType.substring(0, leftParen));
-					}
-				}
-			}
-		}
-		String tzName = (String) plist.objectForKey("serverTimeZone");
-		if (tzName != null) {
-			TimeZone tz = TimeZone.getTimeZone(tzName);
-			setServerTimeZone(tz);
-		}
-		num = _NSStringUtilities.integerFromPlist(plist, "parameterDirection", -1);
-		if (num != -1)
-			setParameterDirection(num);
-		Object val = plist.objectForKey("userInfo");
-		if (val == null)
-			val = plist.objectForKey("userDictionary");
-		setUserInfo((NSDictionary) val);
-		if ((val = plist.objectForKey("internalInfo")) != null)
-			_setInternalInfo((NSDictionary) val);
-	}
-
-	private boolean shouldEncodeIvarWithPrototypeCharacteristic(int ivar, Characteristic key) {
-		return ivar != 0 && (_prototype == null || overridesPrototypeDefinitionForCharacteristic(key));
-	}
-
-	private boolean shouldEncodeIvarWithPrototypeCharacteristic(Object ivar, Characteristic key) {
-		return ivar != null && (_prototype == null || overridesPrototypeDefinitionForCharacteristic(key));
-	}
-
-	private boolean shouldEncodeScalarIvarWithPrototypeCharacteristic(int scalarIvar, Characteristic key) {
-		return _prototype == null && scalarIvar != 0 || _prototype != null && overridesPrototypeDefinitionForCharacteristic(key);
-	}
-
-	public void encodeIntoPropertyList(NSMutableDictionary result) {
-		if (_name != null)
-			result.setObjectForKey(_name, "name");
-		Object plist = prototypeName();
-		if (plist != null)
-			result.setObjectForKey(plist, "prototypeName");
-		plist = columnName();
-		if (plist != null) {
-			if (shouldEncodeIvarWithPrototypeCharacteristic(_columnName, Characteristic.ColumnName))
-				result.setObjectForKey(plist, "columnName");
-		}
-		else {
-			plist = definition();
-			if (plist != null)
-				result.setObjectForKey(plist, "definition");
-		}
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_externalType, Characteristic.ExternalType))
-			result.setObjectForKey(_externalType, "externalType");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_valueType, Characteristic.ValueType))
-			result.setObjectForKey(_valueType, "valueType");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_className, Characteristic.ClassName))
-			result.setObjectForKey(_className, "className");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_writeFormat, Characteristic.WriteFormat))
-			result.setObjectForKey(_writeFormat, "writeFormat");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_readFormat, Characteristic.ReadFormat))
-			result.setObjectForKey(_readFormat, "readFormat");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_width, Characteristic.Width))
-			result.setObjectForKey(String.valueOf(_width), "width");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_serverTimeZone, Characteristic.ServerTimeZone)) {
-			plist = _serverTimeZone.getID();
-			if (plist != null)
-				result.setObjectForKey(plist, "serverTimeZone");
-		}
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_valueFactoryClassName, Characteristic.ValueFactoryClassName))
-			result.setObjectForKey(_valueFactoryClassName, "valueFactoryClassName");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_valueFactoryMethodName, Characteristic.ValueFactoryMethodName))
-			result.setObjectForKey(_valueFactoryMethodName, "valueFactoryMethodName");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_adaptorValueConversionClassName, Characteristic.AdaptorValueConversionClassName))
-			result.setObjectForKey(_adaptorValueConversionClassName, "adaptorValueConversionClassName");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_adaptorValueConversionMethodName, Characteristic.AdaptorValueConversionMethodName))
-			result.setObjectForKey(_adaptorValueConversionMethodName, "adaptorValueConversionMethodName");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_argumentType, Characteristic.FactoryMethodArgumentType))
-			result.setObjectForKey(_stringForFactoryMethodArgumentType(_argumentType), "factoryMethodArgumentType");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_precision, Characteristic.Precision))
-			result.setObjectForKey(String.valueOf(_precision), "precision");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_scale, Characteristic.Scale))
-			result.setObjectForKey(String.valueOf(_scale), "scale");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_flags_isReadOnly ? 1 : 0, Characteristic.ReadOnly))
-			result.setObjectForKey(isReadOnly() ? "Y" : "N", "isReadOnly");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_flags_allowsNull ? 1 : 0, Characteristic.AllowsNull))
-			result.setObjectForKey(allowsNull() ? "Y" : "N", "allowsNull");
-		if (shouldEncodeScalarIvarWithPrototypeCharacteristic(_parameterDirection, Characteristic.ParameterDirection))
-			result.setObjectForKey(String.valueOf(_parameterDirection), "parameterDirection");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_userInfo, Characteristic.UserInfo))
-			result.setObjectForKey(_userInfo.clone(), "userInfo");
-		if (shouldEncodeIvarWithPrototypeCharacteristic(_internalInfo, Characteristic.InternalInfo))
-			result.setObjectForKey(_internalInfo.clone(), "internalInfo");
-	}
-
-	public void awakeWithPropertyList(NSDictionary plist) {
-		Object encoding;
-		String string;
-		if ((string = (String) plist.objectForKey("definition")) != null) {
-			_setDefinitionWithoutFlushingCaches(string);
-			_parent_setIsEdited();
-		}
-		else if ((string = (String) plist.objectForKey("columnName")) != null)
-			setColumnName(string);
-		else if ((encoding = plist.objectForKey("externalName")) != null)
-			if (encoding instanceof String)
-				setColumnName((String) encoding);
-			else if (encoding instanceof NSDictionary)
-				_definitionArray = (_EOExpressionArray) _objectForPlist(encoding);
-	}
-
-	public boolean overridesPrototypeDefinitionForKey(String key) {
-		Characteristic aCharacteristic = Characteristic.characteristicForName(key);
-		return aCharacteristic == null ? false : overridesPrototypeDefinitionForCharacteristic(aCharacteristic);
-	}
-
-	public void setName(String name) {
-		if (name.equals(_name))
-			return;
-		EOEntity entity = entity();
-		EOModel model = null;
-		EOModelGroup group = null;
-		if (entity != null)
-			model = entity.model();
-		if (model != null)
-			group = model.modelGroup();
-		if (group != null)
-			group.loadAllModelObjects();
-		_name = name;
-		_parent_setIsEdited();
-	}
-
-	public void setPrototype(EOAttribute prototype) {
-		if (_prototype == prototype)
-			return;
-		_overwrittenCharacteristics = null;
-		if (prototype == null) {
-			_prototype = null;
-			_prototypeName = null;
-		}
-		else if (_prototypeName == null || !_prototypeName.equals(prototype.name())) {
-			_prototypeName = prototype.name();
-			if (_prototypeName != null) {
-				_prototype = _parentModel().prototypeAttributeNamed(_prototypeName);
-				if (_prototype == null)
-					_prototype = prototype;
-				_updateFromPrototype();
-			}
-			else {
-				_prototype = null;
-				_prototypeName = null;
-			}
-		}
-	}
-
-	public void setReadOnly(boolean yn) {
-		if (_flags_isReadOnly != yn) {
-			if (!yn && isDerived() && !isFlattened())
-				throw new IllegalArgumentException("Unable to remove read only on a derived not flattened attribute");
-			_setReadOnly(yn);
-			_setOverrideForCharacteristic(Characteristic.ReadOnly);
-		}
-	}
-
-	private void _setReadOnly(boolean yn) {
-		if (_flags_isReadOnly != yn) {
-			if (!yn && isDerived() && !isFlattened())
-				throw new IllegalArgumentException("Unable to remove read only on a derived not flattened attribute");
-			_flags_isReadOnly = yn;
-			_parent_setIsEdited();
-			if (_parent != null)
-				_parent._clearAttributesCaches();
-			_flags_isNonUpdateableInitialized = false;
-		}
-	}
-
-	public void setColumnName(String columnName) {
-		if (columnName == null && _columnName == null) {
-			return;
-		}
-		_setColumnName(columnName);
-		_setOverrideForCharacteristic(Characteristic.ColumnName);
-		return;
-	}
-
-	private void _setColumnName(String columnName) {
-		if (columnName == null && _columnName == null) {
-			return;
-		}
-		_definitionArray = null;
-		_columnName = columnName;
-		_parent_setIsEdited();
-		return;
-	}
-
-	public void setDefinition(String definition) {
-		if (definition == null && _definitionArray == null) {
-			return;
-		}
-		_setDefinitionWithoutFlushingCaches(definition);
-		_setValuesFromTargetAttribute();
-		_parent_setIsEdited();
-		return;
-	}
-
-	public void setExternalType(String string) {
-		if (_externalType == null || !_externalType.equals(string)) {
-			_setExternalType(string);
-			_setOverrideForCharacteristic(Characteristic.ExternalType);
-		}
-	}
-
-	private void _setExternalType(String string) {
-		if (_externalType == null || !_externalType.equals(string)) {
-			_externalType = string == null || string.length() <= 0 ? null : string;
-			_parent_setIsEdited();
-		}
-	}
-
-	public void setValueType(String string) {
-		if (_valueType == null || !_valueType.equals(string)) {
-			_setValueType(string);
-			_setOverrideForCharacteristic(Characteristic.ValueType);
-		}
-	}
-
-	private void _setValueType(String string) {
-		if (_valueType == null || !_valueType.equals(string))
-			_valueType = string == null || string.length() <= 0 ? null : string;
-	}
-
-	private String _javaNameForObjcName(String name) {
-		if (name == null)
-			return null;
-		if (name.startsWith(CN_NSPrefix)) {
-			if (name.equals(CN_NSString))
-				return CN_JavaString;
-			if (name.equals(CN_NSNumber))
-				return CN_JavaNumber;
-			if (name.equals(CN_NSDecimalNumber))
-				return CN_JavaBigDecimal;
-			if (name.equals(CN_NSCalendarDate))
-				return CN_JavaNSTimestamp;
-			if (name.equals(CN_NSGregorianDate))
-				return CN_JavaNSTimestamp;
-			if (name.equals(CN_NSData))
-				return CN_JavaNSData;
-		}
-		else if (name.equals(""))
-			return null;
-		return name;
-	}
-
-	private String _objcNameForJavaName(String name) {
-		if (name == null)
-			return null;
-		if (name.equals(CN_JavaString))
-			return CN_NSString;
-		if (name.equals(CN_JavaNumber))
-			return CN_NSNumber;
-		if (name.equals(CN_JavaBigDecimal))
-			return CN_NSDecimalNumber;
-		if (name.equals(CN_JavaNSTimestamp))
-			return CN_NSCalendarDate;
-		if (name.equals(CN_JavaNSData))
-			return CN_NSData;
-		if (name.equals(""))
-			return null;
-
-		return _NSStringUtilities.lastComponentInString(name, '.');
-	}
-
-	/**
-	 * @param name
-	 *            valueClassName
-	 * @deprecated Method setValueClassName is deprecated
-	 */
-
-	public void setValueClassName(String name) {
-		_valueClassName = name == null || name.length() <= 0 ? null : name;
-		_className = _javaNameForObjcName(_valueClassName);
-		_adaptorValueType = -1;
-		_valueTypeClassName = "";
-		_setOverrideForCharacteristic(Characteristic.ClassName);
-	}
-
-	public void setClassName(String name) {
-		_setClassName(name);
-		_setOverrideForCharacteristic(Characteristic.ClassName);
-	}
-
-	private void _setClassName(String name) {
-		_className = name == null || name.length() <= 0 ? null : name;
-		_valueClassName = _objcNameForJavaName(_className);
-		_adaptorValueType = -1;
-		_valueTypeClassName = "";
-	}
-
-	public void setWidth(int length) {
-		_setWidth(length);
-		_setOverrideForCharacteristic(Characteristic.Width);
-	}
-
-	private void _setWidth(int length) {
-		_width = length;
-	}
-
-	public void setPrecision(int precision) {
-		_setPrecision(precision);
-		_setOverrideForCharacteristic(Characteristic.Precision);
-	}
-
-	private void _setPrecision(int precision) {
-		_precision = precision;
-	}
-
-	public void setScale(int scale) {
-		_setScale(scale);
-		_setOverrideForCharacteristic(Characteristic.Scale);
-	}
-
-	private void _setScale(int scale) {
-		_scale = scale;
-	}
-
-	public void setAllowsNull(boolean allowsNull) {
-		if (allowsNull == _flags_allowsNull) {
-			return;
-		}
-		_setAllowsNull(allowsNull);
-		_setOverrideForCharacteristic(Characteristic.AllowsNull);
-		return;
-	}
-
-	private void _setAllowsNull(boolean allowsNull) {
-		if (allowsNull == _flags_allowsNull) {
-			return;
-		}
-		_flags_allowsNull = allowsNull;
-		return;
-	}
-
-	public void setWriteFormat(String string) {
-		_setWriteFormat(string);
-		_setOverrideForCharacteristic(Characteristic.WriteFormat);
-	}
-
-	private void _setWriteFormat(String string) {
-		_writeFormat = _setNewFormatStringOld(string, _writeFormat);
-	}
-
-	public void setReadFormat(String string) {
-		_setReadFormat(string);
-		_setOverrideForCharacteristic(Characteristic.ReadFormat);
-	}
-
-	private void _setReadFormat(String string) {
-		_readFormat = _setNewFormatStringOld(string, _readFormat);
-	}
-
-	public void setParameterDirection(int parameterDirection) {
-		_setParameterDirection(parameterDirection);
-		_setOverrideForCharacteristic(Characteristic.ParameterDirection);
-	}
-
-	private void _setParameterDirection(int parameterDirection) {
-		_parameterDirection = parameterDirection;
-	}
-
-	public void setUserInfo(NSDictionary dictionary) {
-		_setUserInfo(dictionary);
-		_setOverrideForCharacteristic(Characteristic.UserInfo);
-	}
-
-	private void _setUserInfo(NSDictionary dictionary) {
-		_userInfo = dictionary == null || dictionary.count() <= 0 ? null : (NSDictionary) dictionary.clone();
-		_parent_setIsEdited();
-	}
-
-	protected void _setInternalInfo(NSDictionary dictionary) {
-		__setInternalInfo(dictionary);
-		_setOverrideForCharacteristic(Characteristic.InternalInfo);
-	}
-
-	private void __setInternalInfo(NSDictionary dictionary) {
-		_internalInfo = dictionary == null || dictionary.count() <= 0 ? null : (NSDictionary) dictionary.clone();
-		_parent_setIsEdited();
-	}
-
-	public void beautifyName() {
-		setName(_EOStringUtil.nameForExternalNameSeparatorStringInitialCaps(name(), "_", false));
-	}
-
-	public TimeZone serverTimeZone() {
-		if (_serverTimeZone == null)
-			return TimeZone.getDefault();
-
-		return _serverTimeZone;
-	}
-
-	public void setServerTimeZone(TimeZone tz) {
-		_setServerTimeZone(tz);
-		_setOverrideForCharacteristic(Characteristic.ServerTimeZone);
-	}
-
-	private void _setServerTimeZone(TimeZone tz) {
-		_serverTimeZone = (TimeZone) tz.clone();
-	}
-
-	public Object newValueForBytes(byte bytes[], int length) {
-		return newValueForImmutableBytes(bytes);
-	}
-
-	public Object newValueForImmutableBytes(byte bytes[]) {
-		Class dataClass = NSData._CLASS;
-		Object value = null;
-		NSData data = null;
-		if (_valueClass == null) {
-			_valueClass = _NSUtilities.classWithName(className());//_valueClassName);
-			if (_valueClass == null)
-				_valueClass = dataClass;
-		}
-		if (_valueClass == dataClass || _argumentType == FactoryMethodArgumentIsData || _valueFactoryMethod == null) {
-			data = new NSData(bytes, new NSRange(0, bytes.length), true);
-			if (_valueClass == dataClass || _valueFactoryMethod == null)
-				return data;
-		}
-		switch (_argumentType) {
-		default:
-			break;
-
-		case FactoryMethodArgumentIsData:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), data);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-
-		case FactoryMethodArgumentIsBytes:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), bytes);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-
-		case FactoryMethodArgumentIsString:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), _NSStringUtilities.stringForBytes(bytes, "UTF-8"));
-				if (!NSLog.debugLoggingAllowedForLevelAndGroups(NSLog.DebugLevelInformational, NSLog.DebugGroupDatabaseAccess))
-					break;
-				if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelDetailed))
-					NSLog.debug.appendln(new RuntimeException("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding."));
-				else
-					NSLog.debug.appendln("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding.  Set debug level to NSLog.DebugLevelDetailed for more information.");
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-		}
-		return value;
-	}
-
-	/**
-	 * @param bytes
-	 * @param length
-	 * @return newValueForBytesString
-	 * @deprecated Method newValueForBytesString is deprecated
-	 */
-
-	public Object newValueForBytesString(byte bytes[], int length) {
-		Class stringClass = String.class;
-		Object value = null;
-		Object value1 = null;
-		if (_valueClass == null) {
-			_valueClass = _NSUtilities.classWithName(className());//_valueClassName);
-			if (_valueClass == null)
-				_valueClass = stringClass;
-		}
-		if (_valueClass == stringClass) {
-			String result = _NSStringUtilities.stringForBytes(bytes, 0, length, "UTF-8");
-			if (NSLog.debugLoggingAllowedForLevelAndGroups(NSLog.DebugLevelInformational, NSLog.DebugGroupDatabaseAccess))
-				if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelDetailed))
-					NSLog.debug.appendln(new RuntimeException("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding."));
-				else
-					NSLog.debug.appendln("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding.  Set debug level to NSLog.DebugLevelDetailed for more information.");
-			return result;
-		}
-		if (_valueClass == stringClass || _argumentType == 1 || _valueFactoryMethod == null) {
-			value = _NSStringUtilities.stringForBytes(bytes, 0, length, "UTF-8");
-			if (NSLog.debugLoggingAllowedForLevelAndGroups(NSLog.DebugLevelInformational, NSLog.DebugGroupDatabaseAccess))
-				if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelDetailed))
-					NSLog.debug.appendln(new RuntimeException("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding."));
-				else
-					NSLog.debug.appendln("Deprecated implicit bytes->String conversion.  Assuming UTF-8 encoding.  Set debug level to NSLog.DebugLevelDetailed for more information.");
-			if (_valueClass == stringClass || _valueFactoryMethod == null)
-				return value;
-		}
-		switch (_argumentType) {
-		case FactoryMethodArgumentIsData:
-		default:
-			break;
-
-		case FactoryMethodArgumentIsString:
-			try {
-				value1 = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), value);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			value = value1;
-			break;
-
-		case FactoryMethodArgumentIsBytes:
-			try {
-				value1 = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), new Object[] { bytes, _NSUtilities.IntegerForInt(length) });
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			value = value1;
-			break;
-		}
-		return value;
-	}
-
-	public Object newValueForString(String str) {
-		Class stringClass = String.class;
-		Object value = null;
-		if (_valueClass == null) {
-			_valueClass = _NSUtilities.classWithName(className());//_valueClassName);
-			if (_valueClass == null)
-				_valueClass = stringClass;
-		}
-		if (_valueClass == stringClass || _valueFactoryMethod == null)
-			return str;
-		switch (_argumentType) {
-		default:
-			break;
-
-		case FactoryMethodArgumentIsString:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), str);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-
-		case FactoryMethodArgumentIsBytes:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), _NSStringUtilities.bytesForString(str, "UTF-8"));
-				if (!NSLog.debugLoggingAllowedForLevelAndGroups(NSLog.DebugLevelInformational, NSLog.DebugGroupDatabaseAccess))
-					break;
-				if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelDetailed))
-					NSLog.debug.appendln(new RuntimeException("Deprecated implicit String->bytes conversion.  Assuming UTF-8 encoding."));
-				else
-					NSLog.debug.appendln("Deprecated implicit String->bytes conversion.  Assuming UTF-8 encoding.  Set debug level to NSLog.DebugLevelDetailed for more information.");
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-
-		case FactoryMethodArgumentIsData:
-			try {
-				value = _valueFactoryMethod.invoke(valueFactoryClass()==null?_valueClass:valueFactoryClass(), new NSData(str, "UTF-8"));
-				if (!NSLog.debugLoggingAllowedForLevelAndGroups(NSLog.DebugLevelInformational, NSLog.DebugGroupDatabaseAccess))
-					break;
-				if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelDetailed))
-					NSLog.debug.appendln(new RuntimeException("Deprecated implicit String->NSData conversion.  Assuming UTF-8 encoding."));
-				else
-					NSLog.debug.appendln("Deprecated implicit String->NSData conversion.  Assuming UTF-8 encoding.  Set debug level to NSLog.DebugLevelDetailed for more information.");
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-			break;
-		}
-		return value;
-	}
-	
-	public Class valueFactoryClass() {
-		return _valueFactoryClass;
-	}
-
-	public String valueFactoryClassName() {
-		return _valueFactoryClassName;
-	}
-
-	public String valueFactoryMethodName() {
-		return _valueFactoryMethodName;
-	}
-
-	public NSSelector valueFactoryMethod() {
-		return _valueFactoryMethod;
-	}
-
-	public Object adaptorValueByConvertingAttributeValue(Object value) {
-		Object convertedValue = value;
-		NSSelector conversionMethod = adaptorValueConversionMethod();
-		Class conversionClass = adaptorValueConversionClass();
-		if (conversionMethod != null)
-			try {
-				if (conversionClass != null) {
-					convertedValue = conversionMethod.invoke(conversionClass,new Object[]{value});
-				} else {
-					convertedValue = conversionMethod.invoke(value);
-				}
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-		int valueType = adaptorValueType();
-		if(!(AdaptorDateType == valueType && conversionMethod != null && Date.class.isInstance(convertedValue))) {
-			if (!valueClasses[valueType].isInstance(convertedValue) && (valueClasses[valueType] != Number.class || !(convertedValue instanceof Boolean))) {
-				EOEntity parentEntity = (EOEntity) parent();
-				String entityName = parentEntity == null ? "<unspecified>" : parentEntity.name();
-				throw new IllegalArgumentException((new StringBuilder()).append("Unable to convert value of class ").append(convertedValue.getClass().getName()).append(" for attribute '").append(name()).append("' in entity '").append(entityName).append("' to adaptor type EOAttribute.Adaptor").append(valueTypeNames[valueType]).append("Type.  Check the signature of the conversion method ").append(className()).append(".").append(conversionMethod == null ? "NotFound" : conversionMethod.name()).append("().").toString());
-			}
-		}
-		return convertedValue;
-	}
-
-	public String adaptorValueConversionMethodName() {
-		return _adaptorValueConversionMethodName;
-	}
-
-	public NSSelector adaptorValueConversionMethod() {
-		return _adaptorValueConversionMethod;
-	}
-
-	public String adaptorValueConversionClassName() {
-		return _adaptorValueConversionClassName;
-	}
-
-	public Class adaptorValueConversionClass() {
-		return _adaptorValueConversionClass;
-	}
-
-	public int adaptorValueType() {
-		if (_adaptorValueType != -1)
-			return _adaptorValueType;
-		String className = className();//_valueClassName;
-		if (className == null)
-			className = CN_NSData;
-		Class valueClass = _NSUtilities.classWithName(className);
-		if (valueClass == null)
-			throw new IllegalStateException((new StringBuilder()).append("adaptorValueType: unable to load class named '").append(className).append("' for attribute ").append(name()).append(" on entity ").append(entity().name()).toString());
-		if (valueFactoryMethodName() == null) {
-			if (valueClass == String.class)
-				_adaptorValueType = AdaptorCharactersType;
-			else if (_NSUtilities._isClassANumberOrABoolean(valueClass))
-				_adaptorValueType = AdaptorNumberType;
-			else if (NSTimestamp.class.isAssignableFrom(valueClass))
-				_adaptorValueType = AdaptorDateType;
-			else if (NSData.class.isAssignableFrom(valueClass))
-				_adaptorValueType = AdaptorBytesType;
-		}
-		else if (_argumentType == FactoryMethodArgumentIsString)
-			_adaptorValueType = AdaptorCharactersType;
-		else if (_argumentType == FactoryMethodArgumentIsData)
-			_adaptorValueType = AdaptorBytesType;
-		else if (_argumentType == FactoryMethodArgumentIsDate)
-			_adaptorValueType = AdaptorDateType;
-		else if (_argumentType == FactoryMethodArgumentIsBytes)
-			_adaptorValueType = AdaptorBytesType;
-		if (_adaptorValueType == -1)
-			_adaptorValueType = AdaptorBytesType;
-		return _adaptorValueType;
-	}
-
-	/**
-	 * @return adaptorValueClass
-	 * @deprecated Method _adaptorValueClass is deprecated
-	 */
-	protected Class _adaptorValueClass() {
-		return adaptorValueClass();
-	}
-
-	public Class adaptorValueClass() {
-		switch (adaptorValueType()) {
-		case AdaptorCharactersType:
-			return String.class;
-
-		case AdaptorDateType:
-			return NSTimestamp.class;
-
-		case AdaptorNumberType:
-			switch (_valueTypeChar()) {
-			case _VTBoolean:
-				return Boolean.class;
-
-			case _VTShort:
-				return Short.class;
-
-			case _VTInteger:
-				return Integer.class;
-
-			case _VTLong:
-				return Long.class;
-
-			case _VTFloat:
-				return Float.class;
-
-			case _VTDouble:
-				return Double.class;
-
-			case _VTBigDecimal:
-				return BigDecimal.class;
-
-			case _VTByte:
-				return Byte.class;
-			}
-			if (NSLog.debugLoggingAllowedForLevel(NSLog.DebugLevelInformational))
-				NSLog.debug.appendln((new StringBuilder()).append("value type '").append(_valueTypeChar()).append("' on attribute \"").append(name()).append("\" of entity \"").append(entity().name()).append("\" is invalid.\nYou should fix your EOModel.").toString());
-			return Integer.class;
-
-		case AdaptorBytesType:
-			if (adaptorValueConversionMethod() != null && factoryMethodArgumentType() == FactoryMethodArgumentIsString)
-				return String.class;
-
-			return NSData.class;
-		}
-		return Object.class;
-	}
-
-	public String valueTypeClassName() {
-		if (_valueTypeClassName == null)
-			_valueTypeClassName = "";
-		if (_valueTypeClassName.length() == 0) {
-			String className = _valueClassName == null ? NSData.class.getName() : _valueClassName;
-			try {
-				if (valueFactoryMethodName() == null) {
-					Class valueClass = _NSUtilities.classWithName(className);
-					if (valueClass != null) {
-						if (_NSUtilities._isClassANumberOrABoolean(valueClass))
-							switch (_valueTypeChar()) {
-							case _VTByte:
-								valueClass = Byte.class;
-								break;
-
-							case _VTShort:
-								valueClass = Short.class;
-								break;
-
-							case _VTInteger:
-								valueClass = Integer.class;
-								break;
-
-							case _VTLong:
-								valueClass = Long.class;
-								break;
-
-							case _VTFloat:
-								valueClass = Float.class;
-								break;
-
-							case _VTDouble:
-								valueClass = Double.class;
-								break;
-
-							case _VTBigDecimal:
-								valueClass = BigDecimal.class;
-								break;
-
-							case _VTBoolean:
-								valueClass = Boolean.class;
-								break;
-
-							default:
-								if (NSLog.debugLoggingAllowedForLevel(2))
-									NSLog.debug.appendln((new StringBuilder()).append("value type '").append(_valueTypeChar()).append("' on attribute \"").append(name()).append("\" of entity \"").append(entity().name()).append("\" is invalid.\nYou should fix your EOModel.").toString());
-								valueClass = Integer.class;
-								break;
-							}
-						className = valueClass.getName();
-					}
-				}
-			}
-			catch (Throwable exception) {
-			}
-			_valueTypeClassName = className;
-		}
-		return _valueTypeClassName;
-	}
-
-	public int factoryMethodArgumentType() {
-		return _argumentType;
-	}
-
-	public void setFactoryMethodArgumentType(int argumentType) {
-		_setFactoryMethodArgumentType(argumentType);
-		_setOverrideForCharacteristic(Characteristic.FactoryMethodArgumentType);
-	}
-
-	private void _setFactoryMethodArgumentType(int argumentType) {
-		_argumentType = argumentType;
-		if (_valueFactoryMethodName != null)
-			_valueFactoryMethod = new NSSelector(_valueFactoryMethodName, _classForArgumentType());
-	}
-
-	private Class[] _classForArgumentType() {
-		if (_argumentType == FactoryMethodArgumentIsString)
-			return _NSUtilities._StringClassArray;
-		if (_argumentType == FactoryMethodArgumentIsData)
-			return (new Class[] { NSData.class });
-		if (_argumentType == FactoryMethodArgumentIsDate)
-			return (new Class[] { Date.class });
-		if (_argumentType == FactoryMethodArgumentIsBytes)
-			return (new Class[] { byte[].class });
-
-		return null;
-	}
-	
-	public void setValueFactoryClassName(String factoryClassName) {
-		_setValueFactoryClassName(factoryClassName);
-		_setOverrideForCharacteristic(Characteristic.ValueFactoryClassName);
-	}
-	
-	private void _setValueFactoryClassName(String factoryClassName) {
-		if(factoryClassName != null && factoryClassName.length() != 0) {
-			_valueFactoryClassName = factoryClassName;
-			try {
-				_valueFactoryClass = Class.forName(factoryClassName);
-			} catch(ClassNotFoundException e) {
-				_valueFactoryClassName = null;
-			}
-		} else {
-			_valueFactoryClassName = null;
-			_valueFactoryClass = null;
-		}
-	}
-
-	public void setValueFactoryMethodName(String factoryMethodName) {
-		_setValueFactoryMethodName(factoryMethodName);
-		_setOverrideForCharacteristic(Characteristic.ValueFactoryMethodName);
-	}
-
-	private void _setValueFactoryMethodName(String factoryMethodName) {
-		if (factoryMethodName != null && factoryMethodName.length() != 0) {
-			if (factoryMethodName.endsWith(":")) {
-				_valueFactoryMethodName = factoryMethodName.substring(0, factoryMethodName.length() - 1);
-			} else {
-				_valueFactoryMethodName = factoryMethodName;
-			}
-			_valueFactoryMethod = new NSSelector(_valueFactoryMethodName, _classForArgumentType());
-		} else {
-			_valueFactoryMethodName = null;
-			_valueFactoryMethod = null;
-		}
-	}
-
-	public void setAdaptorValueConversionClassName(String conversionClassName) {
-		_setAdaptorValueConversionClassName(conversionClassName);
-		_setOverrideForCharacteristic(Characteristic.AdaptorValueConversionClassName);
-	}
-
-	private void _setAdaptorValueConversionClassName(String conversionClassName) {
-		if (conversionClassName != null && conversionClassName.length() != 0) {
-			_adaptorValueConversionClassName = conversionClassName;
-			try {
-				_adaptorValueConversionClass = Class.forName(conversionClassName);
-			} catch (ClassNotFoundException e) {
-				_adaptorValueConversionClassName = null;
-			}
-		} else {
-			_adaptorValueConversionClassName = null;
-			_adaptorValueConversionClass = null;
-		}
-	}
-
-	public void setAdaptorValueConversionMethodName(String conversionMethodName) {
-		_setAdaptorValueConversionMethodName(conversionMethodName);
-		_setOverrideForCharacteristic(Characteristic.AdaptorValueConversionMethodName);
-	}
-
-	private void _setAdaptorValueConversionMethodName(String conversionMethodName) {
-		if (conversionMethodName != null && conversionMethodName.length() != 0) {
-			_adaptorValueConversionMethodName = conversionMethodName;
-			if(adaptorValueConversionClass()!=null) {
-				Class valueClass = _NSUtilities.classWithName(className());					
-				_adaptorValueConversionMethod = new NSSelector(_adaptorValueConversionMethodName, new Class[]{valueClass});
-			} else {
-				_adaptorValueConversionMethod = new NSSelector(_adaptorValueConversionMethodName, null);
-			}
-		} else {
-			_adaptorValueConversionMethodName = null;
-			_adaptorValueConversionMethod = null;
-		}
-	}
-
-	public Object validateValue(Object valueP) throws com.webobjects.foundation.NSValidation.ValidationException {
-		Object value = valueP;
-		if (value == null || value == NSKeyValueCoding.NullValue) {
-			if (allowsNull())
-				return valueP;
-			if (entity().primaryKeyAttributes().indexOfIdenticalObject(this) != -1)
-				return valueP;
-
-			throw new com.webobjects.foundation.NSValidation.ValidationException((new StringBuilder()).append("The ").append(name()).append(" property of ").append(entity().name()).append(" is not allowed to be null.").toString(), this, name());
-		}
-		String className = className();
-		if (className == null)
-			return valueP;
-		Class aClass = _NSUtilities.classWithName(className);
-		if (aClass == null) {
-			if (NSLog.debugLoggingAllowedForLevelAndGroups(2, 128L))
-				NSLog.debug.appendln((new StringBuilder()).append("Unable to find the class ").append(className).append(" in the Java runtime. Unable to validate. Please check your CLASSPATH, or the type for attribute ").append(name()).toString());
-			return valueP;
-		}
-		if (!aClass.isInstance(value)) {
-			value = _NSUtilities.tryToConvertIntoNumberOrBooleanValueClass(value, aClass);
-			if (!aClass.isInstance(value)) {
-				String valueString = value.toString();
-				try {
-					if (aClass == BigDecimal.class)
-						value = new BigDecimal(valueString);
-					else if (Number.class.isAssignableFrom(aClass))
-						value = _EOStringUtil.numberWithStringType(valueString, _valueTypeChar());
-				}
-				catch (Exception e) {
-					throw new com.webobjects.foundation.NSValidation.ValidationException((new StringBuilder()).append("Error encountered converting value of class ").append(value.getClass().getName()).append(" to type specified in attribute '").append(name()).append("' of entity '").append(entity().name()).append("'").toString(), this, name());
-				}
-			}
-		}
-		if (value == null)
-			throw new com.webobjects.foundation.NSValidation.ValidationException((new StringBuilder()).append("Error encountered converting null value to type specified in attribute '").append(name()).append("' of entity '").append(entity().name()).append("'").toString(), this, name());
-		int maxLen = width();
-		if (maxLen != 0) {
-			int currLength = 0;
-			Object primitiveValue;
-			try {
-				primitiveValue = adaptorValueByConvertingAttributeValue(value);
-			}
-			catch (Exception e) {
-				throw new com.webobjects.foundation.NSValidation.ValidationException((new StringBuilder()).append("Error encountered converting value of class ").append(value.getClass().getName()).append(" to type specified in attribute '").append(name()).append("' of entity '").append(entity().name()).append("'. Conversion exception is : ").append(e.getMessage()).toString(), this, name());
-			}
-			if (primitiveValue instanceof String)
-				currLength = ((String) primitiveValue).length();
-			else if (primitiveValue instanceof NSData)
-				currLength = ((NSData) primitiveValue).length();
-			if (currLength > maxLen)
-				throw new com.webobjects.foundation.NSValidation.ValidationException((new StringBuilder()).append("The ").append(name()).append(" property of ").append(entity().name()).append(" exceeds maximum length of ").append(maxLen).append(" characters").toString(), this, name());
-		}
-		return value;
-	}
-
-	boolean referencesProperty(Object property) {
-		if (_definitionArray == null)
-			return false;
-
-		return _definitionArray.referencesObject(property);
-	}
-
-	void setParent(Object parent) {
-		if (parent == null) {
-			_parent = null;
-			_parentStoredProcedure = null;
-		} else if (parent instanceof EOEntity) {
-			_parent = (EOEntity) parent;
-			_parentStoredProcedure = null;
-		} else if (parent instanceof EOStoredProcedure) {
-			_parent = null;
-			_parentStoredProcedure = (EOStoredProcedure) parent;
-		} else {
-			throw new IllegalArgumentException((new StringBuilder()).append("Invalid object of type ").append(parent.getClass().getName()).append(" passed to setParent (expected EOEntity or EOStoredProcedure").toString());
-		}
-	}
-
-	void setEntity(EOEntity entity) {
-		if (_parent == entity)
-			return;
-		if (_parent != null && this == _parent_attributeNamed(name()))
-			_parent_removeAttribute(this);
-		setParent(entity);
-	}
-
-	public void _setSourceToDestinationKeyMap(NSDictionary mapping) {
-		_sourceToDestinationKeyMap = mapping;
-	}
-
-	public NSDictionary _sourceToDestinationKeyMap() {
-		if (_sourceToDestinationKeyMap == null)
-			_sourceToDestinationKeyMap = entity()._keyMapForRelationshipPath(relationshipPath());
-		return _sourceToDestinationKeyMap;
-	}
-
-	public String relationshipPath() {
-		if (!isFlattened())
-			return null;
-		StringBuffer relPath = new StringBuffer();
-		int iCount = _definitionArray.count() - 1;
-		for (int i = 0; i < iCount; i++) {
-			if (i > 0)
-				relPath.append('.');
-			relPath.append(((EORelationship) _definitionArray.objectAtIndex(i)).name());
-		}
-
-		return new String(relPath);
-	}
-
-	EOAttribute targetAttribute() {
-		if (!isFlattened())
-			return null;
-
-		return (EOAttribute) _definitionArray.lastObject();
-	}
-
-	public String _setNewFormatStringOld(String newString, String old) {
-		if (old == null || !old.equals(newString)) {
-			_parent_setIsEdited();
-			return newString == null || newString.length() <= 0 ? null : newString;
-		}
-
-		return old;
-	}
-
-	public int _factoryMethodArgumentTypeFromString(String string) {
-		String aString = (string == null ? "" : string).toLowerCase();
-		if (aString.equals(FactoryMethodArgumentIsBytesString.toLowerCase()))
-			return FactoryMethodArgumentIsBytes;
-		if (aString.equals(FactoryMethodArgumentIsStringString.toLowerCase()))
-			return FactoryMethodArgumentIsString;
-		if (aString.equals(FactoryMethodArgumentIsDateString.toLowerCase()))
-			return FactoryMethodArgumentIsDate;
-		return !aString.equals("EOFactoryMethodArgumentIsNSString".toLowerCase()) ? FactoryMethodArgumentIsData : FactoryMethodArgumentIsString;
-	}
-
-	public String _stringForFactoryMethodArgumentType(int type) {
-		switch (type) {
-		case FactoryMethodArgumentIsBytes:
-			return FactoryMethodArgumentIsBytesString;
-
-		case FactoryMethodArgumentIsString:
-			return FactoryMethodArgumentIsStringString;
-
-		case FactoryMethodArgumentIsData:
-			return FactoryMethodArgumentIsDataString;
-
-		case FactoryMethodArgumentIsDate:
-			return FactoryMethodArgumentIsDateString;
-		}
-		return FactoryMethodArgumentIsDataString;
-	}
-
-	protected _EOExpressionArray _definitionArray() {
-		return _definitionArray;
-	}
-
-	protected void _setDefinitionArray(_EOExpressionArray definitionArray) {
-		if (_definitionArray == definitionArray) {
-			return;
-		}
-		_definitionArray = definitionArray;
-		_setValuesFromTargetAttribute();
-		_removeFromEntityArraySelector(entity().primaryKeyAttributes(), _setPrimaryKeyAttributesSelector);
-		_parent_setIsEdited();
-		return;
-	}
-
-	protected void _setDefinitionWithoutFlushingCaches(String definition) {
-		if (_parent != null) {
-			_columnName = null;
-			if (definition == null) {
-				_definitionArray = null;
-				return;
-			}
-			Object exprArray = _parent._parseDescriptionIsFormatArguments(definition, false, null);
-			if (exprArray != null) {
-				if (!(exprArray instanceof _EOExpressionArray))
-					exprArray = new _EOExpressionArray(exprArray);
-				exprArray = _normalizeDefinitionPath(exprArray, null);
-				_definitionArray = (_EOExpressionArray) exprArray;
-			}
-			_removeFromEntityArraySelector(_parent_primaryKeyAttributes(), _setPrimaryKeyAttributesSelector);
-		}
-	}
-
-	protected void _setValuesFromTargetAttribute() {
-		if (isFlattened()) {
-			EOAttribute property = (EOAttribute) _definitionArray.lastObject();
-			setExternalType(property.externalType());
-			setClassName(property.className());
-			setValueType(property.valueType());
-			setWidth(property.width());
-			setAllowsNull(property.allowsNull());
-			setReadFormat(property.readFormat());
-			setWriteFormat(property.writeFormat());
-			setReadOnly(property.isReadOnly());
-			setParameterDirection(property.parameterDirection());
-			setUserInfo(property.userInfo());
-			_setInternalInfo(property._internalInfo());
-			int adaptorDataType = property.adaptorValueType();
-			if (adaptorDataType == AdaptorNumberType) {
-				setPrecision(property.precision());
-				setScale(property.scale());
-			}
-			else if (adaptorDataType == AdaptorDateType)
-				setServerTimeZone(property.serverTimeZone());
-			else if (adaptorDataType == AdaptorBytesType) {
-				setValueFactoryClassName(property.valueFactoryClassName());
-				setValueFactoryMethodName(property.valueFactoryMethodName());
-				setAdaptorValueConversionClassName(property.adaptorValueConversionClassName());
-				setAdaptorValueConversionMethodName(property.adaptorValueConversionMethodName());
-				setFactoryMethodArgumentType(property.factoryMethodArgumentType());
-			}
-		}
-	}
-
-	protected Object _objectForPlist(Object plist) {
-		if (plist instanceof String)
-			return plist;
-		if (!(plist instanceof NSDictionary))
-			return null;
-		NSDictionary pl = (NSDictionary) plist;
-		String string;
-		if ((string = (String) pl.objectForKey("name")) != null)
-			return entity()._parsePropertyName(string);
-		if ((string = (String) pl.objectForKey("path")) != null)
-			return entity()._parsePropertyName(string);
-		NSArray array;
-		if ((array = (NSArray) pl.objectForKey("array")) == null)
-			return null;
-		_EOExpressionArray result = new _EOExpressionArray();
-		if ((string = (String) pl.objectForKey("prefix")) != null)
-			result.setPrefix(string);
-		if ((string = (String) pl.objectForKey("infix")) != null)
-			result.setInfix(string);
-		if ((string = (String) pl.objectForKey("suffix")) != null)
-			result.setSuffix(string);
-		int count = array.count();
-		for (int i = 0; i < count; i++) {
-			Object object = array.objectAtIndex(i);
-			if ((object = _objectForPlist(object)) != null)
-				result.addObject(object);
-		}
-
-		return result;
-	}
-
-	protected void _removeFromEntityArraySelector(NSArray oldArray, NSSelector sel) {
-		if (oldArray.indexOfObject(this) != -1) {
-			NSMutableArray newArray = new NSMutableArray(oldArray);
-			newArray.removeIdenticalObject(this);
-			try {
-				sel.invoke(entity(), newArray);
-			} catch (IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch (NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-		}
-	}
-
-	protected Object _normalizeDefinitionPath(Object definition, NSArray attributePath) {
-		NSArray path = null;
-		if (attributePath != null)
-			path = attributePath;
-		else
-			path = NSArray.emptyArray();
-		if (definition instanceof String)
-			return definition;
-		Object nDefinition;
-		if (definition instanceof EOAttribute) {
-			EOAttribute attribute = (EOAttribute) definition;
-			if (attribute == this)
-				return null;
-			if (attribute.isDerived()) {
-				_EOExpressionArray attrDef = attribute._definitionArray();
-				nDefinition = _normalizeDefinitionPath(attrDef, path);
-				if (nDefinition == null)
-					return null;
-			} else if (path.count() == 0) {
-				nDefinition = attribute;
-			} else {
-				_EOExpressionArray newPath = new _EOExpressionArray();
-				newPath.setInfix(".");
-				newPath.addObjectsFromArray(path);
-				newPath.addObject(attribute);
-				nDefinition = newPath;
-			}
-			return nDefinition;
-		}
-		int cnt;
-		if (((_EOExpressionArray) definition)._isPropertyPath()) {
-			_EOExpressionArray newPath = new _EOExpressionArray();
-			newPath.setInfix(".");
-			newPath.addObjectsFromArray(path);
-			cnt = ((_EOExpressionArray) definition).count() - 1;
-			for (int i = 0; i < cnt; i++)
-				newPath.addObject(((_EOExpressionArray) definition).objectAtIndex(i));
-
-			EOAttribute attribute = (EOAttribute) ((_EOExpressionArray) definition).lastObject();
-			if (attribute.isDerived()) {
-				_EOExpressionArray attrDef = attribute._definitionArray();
-				nDefinition = _normalizeDefinitionPath(attrDef, newPath);
-				if (nDefinition == null)
-					return null;
-			} else {
-				newPath.addObject(attribute);
-				nDefinition = newPath;
-			}
-			return nDefinition;
-		}
-		nDefinition = new _EOExpressionArray();
-		cnt = ((_EOExpressionArray) definition).count();
-		for (int i = 0; i < cnt; i++) {
-			Object elem = ((_EOExpressionArray) definition).objectAtIndex(i);
-			Object nElem = _normalizeDefinitionPath(elem, path);
-			if (nElem == null)
-				return null;
-			if ((nElem instanceof _EOExpressionArray) && !((_EOExpressionArray) nElem)._isPropertyPath()) {
-				int jcnt = ((_EOExpressionArray) nElem).count();
-				for (int j = 0; j < jcnt; j++)
-					((_EOExpressionArray) nDefinition).addObject(((_EOExpressionArray) nElem).objectAtIndex(j));
-
-			} else {
-				((_EOExpressionArray) nDefinition).addObject(nElem);
-			}
-		}
-
-		return nDefinition;
-	}
-
-	public void _flushCache() {
-	}
-
-	public String valueForSQLExpression(EOSQLExpression context) {
-		if (context != null)
-			return context.sqlStringForAttribute(this);
-		if (_definitionArray != null)
-			return _definitionArray.valueForSQLExpression(context);
-
-		return name();
-	}
-
-	protected EOAttribute(EOEntity entity, String definition) {
-		this();
-		_name = definition;
-		setParent(entity);
-		setDefinition(definition);
-	}
-
-	public static final int FactoryMethodArgumentIsData = 0;
-	public static final int FactoryMethodArgumentIsString = 1;
-	public static final int FactoryMethodArgumentIsBytes = 2;
-	public static final int FactoryMethodArgumentIsDate = 3;
-	public static final int AdaptorNumberType = 0;
-	public static final int AdaptorCharactersType = 1;
-	public static final int AdaptorBytesType = 2;
-	public static final int AdaptorDateType = 3;
-	public static final int Void = 0;
-	public static final int InParameter = 1;
-	public static final int OutParameter = 2;
-	public static final int InOutParameter = 3;
-	private static final NSSelector _setPrimaryKeyAttributesSelector;
-	protected String _name;
-	protected EOEntity _parent;
-	protected EOStoredProcedure _parentStoredProcedure;
-	protected String _prototypeName;
-	protected EOAttribute _prototype;
-	protected String _columnName;
-	protected _EOExpressionArray _definitionArray;
-	protected String _externalType;
-	protected String _valueType;
-	protected String _valueClassName;
-	protected String _className;
-	protected int _adaptorValueType;
-	protected String _valueTypeClassName;
-	protected String _readFormat;
-	protected String _writeFormat;
-	protected TimeZone _serverTimeZone;
-	protected int _width;
-	protected int _precision;
-	protected int _scale;
-	protected Class _valueClass;
-	int _argumentType;
-	protected String _valueFactoryClassName;
-	protected String _valueFactoryMethodName;
-	protected Class _valueFactoryClass;
-	protected String _adaptorValueConversionMethodName;
-	protected String _adaptorValueConversionClassName;
-	protected Class _adaptorValueConversionClass;
-	protected NSSelector _valueFactoryMethod;
-	protected NSSelector _adaptorValueConversionMethod;
-	protected boolean _flags_allowsNull;
-	protected boolean _flags_isReadOnly;
-	protected boolean _flags_isNonUpdateable;
-	protected boolean _flags_isNonUpdateableInitialized;
-	protected NSDictionary _sourceToDestinationKeyMap;
-	protected int _parameterDirection;
-	protected NSDictionary _userInfo;
-	public NSDictionary _internalInfo;
-	private static final String CN_JavaString = "java.lang.String";
-	private static final String CN_JavaNumber = "java.lang.Number";
-	private static final String CN_JavaBigDecimal = "java.math.BigDecimal";
-	private static final String CN_JavaNSTimestamp = "com.webobjects.foundation.NSTimestamp";
-	private static final String CN_JavaNSData = "com.webobjects.foundation.NSData";
-	private static final String CN_NSString = "NSString";
-	private static final String CN_NSNumber = "NSNumber";
-	private static final String CN_NSDecimalNumber = "NSDecimalNumber";
-	private static final String CN_NSCalendarDate = "NSCalendarDate";
-	private static final String CN_NSGregorianDate = "NSGregorianDate";
-	private static final String CN_NSData = "NSData";
-	private static final String CN_NSPrefix = "NS";
-	public static final char _VTByte = 'b';
-	public static final char _VTShort = 's';
-	public static final char _VTInteger = 'i';
-	public static final char _VTLong = 'l';
-	public static final char _VTFloat = 'f';
-	public static final char _VTDouble = 'd';
-	public static final char _VTBigDecimal = 'B';
-	public static final char _VTBoolean = 'c';
-	public static final char _VTDate = 'D';
-	public static final char _VTTime = 't';
-	public static final char _VTTimestamp = 'T';
-	public static final char _VTString = 'S';
-	public static final char _VTCharStream = 'C';
-	public static final char _VTEncodedBytes = 'E';
-	public static final char _VTCharTrimString = 'c';
-	public static final char _VTUnknown = ' ';
-	public static final char _VTCoerceDate = 'M';
-	public static final String FactoryMethodArgumentIsBytesString = "EOFactoryMethodArgumentIsBytes";
-	public static final String FactoryMethodArgumentIsStringString = "EOFactoryMethodArgumentIsString";
-	public static final String FactoryMethodArgumentIsDataString = "EOFactoryMethodArgumentIsData";
-	public static final String FactoryMethodArgumentIsDateString = "EOFactoryMethodArgumentIsDate";
-	private Map _overwrittenCharacteristics;
-	private static Class valueClasses[];
-	private static String valueTypeNames[] = { "Number", "Characters", "Bytes", "Date" };
-
-	static {
-		_setPrimaryKeyAttributesSelector = new NSSelector("setPrimaryKeyAttributes", _NSUtilities._ArrayClassArray);
-		valueClasses = (new Class[] { Number.class, String.class, NSData.class, NSTimestamp._CLASS });
-	}
-}

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/jdbcadaptor/ERXJDBCColumn.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/jdbcadaptor/ERXJDBCColumn.java	2011-01-27 20:09:38 UTC (rev 11923)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/jdbcadaptor/ERXJDBCColumn.java	2011-01-28 03:59:44 UTC (rev 11924)
@@ -78,51 +78,6 @@
 				}
 			}
 		}
-		
-		/*
-		 * Added support for custom date types
-		 */
-		if(_adaptorValueType == EOAttribute.AdaptorDateType && _customType) {
-			
-			//Get the adaptor date value
-			Date d = null;
-			try {
-				switch(_valueType) {
-				case EOAttribute._VTDate:
-				case EOAttribute._VTCoerceDate:
-					d = _rs.getDate(_column);
-					break;
-				case EOAttribute._VTTime:
-					d = _rs.getTime(_column);
-					break;
-				case EOAttribute._VTTimestamp:
-					d = _rs.getTimestamp(_column);
-					break;
-				default:
-					throw new IllegalStateException("AdaptorValueType is AdaptorDateType but valueType is: " + _valueType);
-				}
-			} catch(SQLException e) {
-				throw new JDBCAdaptorException(e);
-			}
-			
-			//Call the custom factory method
-			try {
-				if(_attribute.valueFactoryClass() != null) {
-					Class<?> factoryClass = _attribute.valueFactoryClass();
-					return _attribute.valueFactoryMethod().invoke(factoryClass, d);
-				}
-				Class<?> c = _NSUtilities.classWithName(_attribute.className());
-				return _attribute.valueFactoryMethod().invoke(c, d);
-			} catch(IllegalAccessException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch(IllegalArgumentException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch(NoSuchMethodException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			} catch(InvocationTargetException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
-			}
-		}
 		try {
 			return super._fetchValue(flag);
 		} catch(NSForwardException ex) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11923
          http://wonder.svn.sourceforge.net/wonder/?rev=11923&view=rev
Author:   marroz
Date:     2011-01-27 20:09:38 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Add raw row support for arbitrary columns.
Fixed bugs.
Changed class and method names to shorter, better ones.

Modified Paths:
--------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java

Added Paths:
-----------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java	2011-01-27 20:09:38 UTC (rev 11923)
@@ -1,17 +1,31 @@
 package er.extensions.eof;
 
 import com.webobjects.eoaccess.EOAttribute;
+import com.webobjects.eoaccess.EOEntity;
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eoaccess.EOUtilities;
+import com.webobjects.eocontrol.EOEditingContext;
 
 /**
  * This class models an SQL binding based on a model keypath/value pair.
  * <p>
- * The keypath refers to the base entity of the SQL expression. As an example, if the
- * base entity is Person, than a binding for person's first name would have a keypath
- * of "firstName". The name of the person's department would be "department.name". The
- * keypath is used to inspect the model and obtain the correct {@link EOAttribute} used
- * to handle SQL generation (value type, conversion, etc).
+ * When the {@link #ERXKeyValueBinding(String, Object)} constructor is used, <code>keypath</code>
+ * refers to the base entity of the SQL expression. As an example, if the base entity is
+ * Person, than a binding for person's first name would have a keypath of "firstName".
+ * The name of the person's department would be "department.name". This constructor should
+ * be used when the base entity is known. This happens on {@link ERXSQLQuery}
+ * methods that receive an entity name.
  * </p>
+ * <p>
+ * When using the {@link #ERXKeyValueBinding(String, String, Object)} constructor, <code>keypath</code>
+ * works the same way, but refers to the entity whose name is passed in as the constructor first
+ * argument. This constructor should be used when the base entity is not specified, like in
+ * {@link ERXSQLQuery#runQuery(EOEditingContext, String, String, ERXSQLBinding...)}.
+ * </p>
+ * <p>
+ * The optional entity name and keypath are used to inspect the model and obtain the correct
+ * {@link EOAttribute} used to handle SQL generation (value type, conversion, etc).
+ * </p>
  */
 public class ERXKeyValueBinding implements ERXSQLBinding {
     
@@ -26,6 +40,11 @@
     private Object _value;
     
     /**
+     * Optional entity name.
+     */
+    private String _entityName;
+    
+    /**
      * Obtains new binding wrapper for passed in EOF key and value
      * 
      * @param keyPath
@@ -37,6 +56,20 @@
         _keyPath = keyPath;
         _value = value;
     }
+    
+    /**
+     * Obtains new binding wrapper for passed in EOF key and value
+     * 
+     * @param keyPath
+     *          The EOF key
+     * @param value
+     *          The value to bind
+     */
+    public ERXKeyValueBinding( String entityName, String keyPath, Object value ) {
+        _entityName = entityName;
+        _keyPath = keyPath;
+        _value = value;
+    }
 
     /**
      * The EOF key of the wrapped binding
@@ -55,8 +88,39 @@
     public Object value() {
         return _value;
     }
+    
+    /**
+     * The optional entity name.
+     * <p>
+     * If the entity name is defined, keyPath applies to that entity and not the base SQL
+     * expression this binding will be applied to.
+     * </p>
+     * 
+     * @return The entity name, if defined. Null otherwise.
+     */
+    public String entityName() {
+        return _entityName;
+    }
 
-    public String sqlStringForBindingOnExpression(EOSQLExpression expression) {
-        return expression.sqlStringForValue( value(), keyPath() );
+    public String sqlStringForBindingOnExpression(EOSQLExpression expression, EOEditingContext ec) {
+        if (entityName() == null) {
+            if (expression.entity() == null) {
+                throw new RuntimeException("When using methods without an explicit entity name, the ERXKeyValueBinding(String entityName, String keyPath, Object value) constructor must be used.");
+            }
+            return expression.sqlStringForValue( value(), keyPath() );
+        } else {
+            // marroz: This is a very nasty trick. The rational behind this is that we want to use expression.sqlStringForValue
+            // as much as possible, to obtain the database-specific variable placeholder. We could do something simpler like
+            // ERXObjectBinding does, but we would not obtain that db-specific placeholder.
+            EOEntity oldEntity = expression.entity();
+            expression._setEntity(EOUtilities.entityNamed(ec, entityName()));
+            String result = expression.sqlStringForValue( value(), keyPath() );
+            expression._setEntity(oldEntity);
+            return result;
+        }
     }
+
+    public boolean isModelAttribute() {
+        return true;
+    }
 }

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java	2011-01-27 20:09:38 UTC (rev 11923)
@@ -4,9 +4,9 @@
 
 import com.webobjects.eoaccess.EOAttribute;
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.foundation.NSData;
 import com.webobjects.foundation.NSDictionary;
-import com.webobjects.foundation.NSKeyValueCoding;
 import com.webobjects.foundation.NSTimestamp;
 
 /**
@@ -87,10 +87,14 @@
         _attribute = attribute;
     }
 
-    public String sqlStringForBindingOnExpression(EOSQLExpression expression) {
+    public String sqlStringForBindingOnExpression(EOSQLExpression expression, EOEditingContext ec) {
         NSDictionary binding = expression.bindVariableDictionaryForAttribute( _attribute, _value );
         expression.addBindVariableDictionary(binding);
         return (String) binding.objectForKey(EOSQLExpression.BindVariablePlaceHolderKey);
     }
+    
+    public boolean isModelAttribute() {
+        return false;
+    }
 
 }

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java	2011-01-27 20:09:38 UTC (rev 11923)
@@ -1,6 +1,7 @@
 package er.extensions.eof;
 
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eocontrol.EOEditingContext;
 
 /**
  * Interface for binding wrapper objects.
@@ -15,5 +16,19 @@
      *          EOSQLExpression being built
      * @return the SQL placeholder string for the used DB, usually "?"
      */
-    public String sqlStringForBindingOnExpression( EOSQLExpression expression );
+    public String sqlStringForBindingOnExpression( EOSQLExpression expression, EOEditingContext ec );
+    
+    /**
+     * True if the binded attribute is an existing EOModel attribute, false otherwise.
+     * <p>
+     * A binding should return true if the binding contains enough information to know what
+     * model attribute the value will be binded to. Bindings that return true will benefit
+     * from proper type conversion, as defined in the model (for instance, converting a
+     * boolean to a string or integer).
+     * </p>
+     * 
+     * @return True if the binded attribute is an existing EOModel attribute, false otherwise.
+     */
+    public boolean isModelAttribute();
+    
 }

Copied: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java (from rev 11917, branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java)
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java	                        (rev 0)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java	2011-01-27 20:09:38 UTC (rev 11923)
@@ -0,0 +1,574 @@
+package er.extensions.eof;
+
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Enumeration;
+
+import org.apache.log4j.Logger;
+
+import com.webobjects.eoaccess.EOAdaptorChannel;
+import com.webobjects.eoaccess.EOAdaptorContext;
+import com.webobjects.eoaccess.EOAttribute;
+import com.webobjects.eoaccess.EODatabaseChannel;
+import com.webobjects.eoaccess.EODatabaseContext;
+import com.webobjects.eoaccess.EOEntity;
+import com.webobjects.eoaccess.EOModel;
+import com.webobjects.eoaccess.EOModelGroup;
+import com.webobjects.eoaccess.EOModelSQLParser;
+import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eoaccess.EOUtilities;
+import com.webobjects.eocontrol.EOEditingContext;
+import com.webobjects.eocontrol.EOFetchSpecification;
+import com.webobjects.eocontrol.EOObjectStore;
+import com.webobjects.eocontrol._EOMutableKnownKeyDictionary;
+import com.webobjects.foundation.NSArray;
+import com.webobjects.foundation.NSDictionary;
+import com.webobjects.foundation.NSKeyValueCoding;
+import com.webobjects.foundation.NSMutableArray;
+import com.webobjects.foundation._NSDelegate;
+import com.webobjects.jdbcadaptor.JDBCChannel;
+import com.webobjects.jdbcadaptor.JDBCColumn;
+import com.webobjects.jdbcadaptor.JDBCContext;
+
+/**
+ * This class allows SQL queries with binded variables to be run against the database. It's possible
+ * to obtain EOs, raw rows or a batch iterator, depending on the used method.
+ * <p>
+ * Binded values are passed in using {@link ERXSQLBinding} implementations. Currently, there are two available
+ * implementations: {@link ERXKeyValueBinding} and {@link ERXObjectBinding}. The first one should be used if
+ * the binding matches a column modeled in an EOModel. This way, any data type conversions that would happen
+ * on normal EOF usage are also applied when generating the SQL query. An example of this can be converting a
+ * boolean value to a string or an integer. {@link ERXObjectBinding} can be used for non-modeled columns.
+ * Please read the {@link ERXObjectBinding} class documentation for important notes regarding some databases
+ * that expect SQL queries with binding typification.
+ * </p>
+ * <p>
+ * This class is used by calling the most appropriate static method for the intended usage. Specific requirements
+ * for the SQL query resulting columns are detailed on each of the method's documentation. Generally, you need
+ * to provide a query returning the appropriate columns and using the '?' character for each binded value.
+ * Depending on the database plug-in being used, the '?' character will be automatically replaced by a different
+ * expression if the {@link ERXKeyValueBinding} class is used to wrap the binded value. In PostgreSQL, for instance,
+ * the '?' character could be replaced by '?::varchar(1000)'.
+ * </p>
+ * <p>
+ * Queries may be written using tokens described in {@link EOModelSQLParser}. This simplifies writing SQL queries,
+ * as entity, attribute and relationship names can be used instead of table and column names.
+ * </p>
+ * <p>
+ * Here are some sample uses of this class:
+ * </p>
+ * <pre>
+ *   // Obtains EOs that match the query
+ *   ERXSQLQuery.objectsForQuery(editingContext(), Song.ENTITY_NAME,
+ *     "SELECT * FROM SONG WHERE FAVORITE = ? AND DURATION > ? ORDER BY NUMBER ASC", true,
+ *     new ERXKeyValueBinding("favorite", true), new ERXKeyValueBinding("duration", 120));
+ *     
+ *   // Obtains raw rows for query
+ *   ERXSQLQuery.rowsForQueryOnEntity(editingContext(), Song.ENTITY_NAME,
+ *     "SELECT t0.NAME, t0.DURATION FROM SONG t0 WHERE COMPOSER = ?", new ERXKeyValueBinding("composer", "Mozart"));
+ *     
+ *   // Runs a query that returns no objects, using EOModelSQLParser-style tokens
+ *   ERXSQLQuery.runQuery(editingContext(), "SongsModel",
+ *     "DELETE FROM {Song} WHERE {favorite} = ?", new ERXKeyValueBinding("Song", "favorite", false));
+ *   
+ *   // Obtains ERXFetchSpecificationBatchIterator
+ *   // Note the query must obtain the primary key!
+ *   ERXSQLQuery.batchIteratorForQuery(editingContext(), Employee.ENTITY_NAME,
+ *     "SELECT ID FROM EMPLOYEE WHERE HEIGHT < ? AND FIRST_NAME = ? ORDER BY NUMBER DESC", false, 100,
+ *     new NSArray<EOSortOrdering>(new EOSortOrdering[] {new EOSortOrdering("number", EOSortOrdering.CompareDescending)}),
+ *     new ERXObjectBinding(190), new ERXKeyValueBinding("firstName", "John"));
+ * </pre>
+ */
+public class ERXSQLQuery {
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * Please read the {@link #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
+     * documentation for the necessary details on how to use both methods.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @see #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
+        return objectsForQuery(ec, entityName, query, false, null, bindings);
+    }
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * Please read the {@link #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
+     * documentation for the necessary details on how to use both methods.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}. 
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @see #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, ERXSQLBinding... bindings ) {
+        return objectsForQuery(ec, entityName, query, refreshesCache, null, bindings);
+    }
+
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The method will
+     * process the query result and return EOs of the requested entity.
+     * </p>
+     * <p>
+     * There are some important requirements regarding the passed in query:
+     * </p>
+     * <ul>
+     *  <li>The query must return all the columns of the affected table that are mapped in the modeled
+     *  Entity. 'SELECT * FROM Table ...' is the easiest way to achieve this. Alias are supported, like
+     *  'SELECT t0.* FROM Table t0 ...'.</li>
+     *  <li>The placeholder for binded variables must be the '?' character. This method will process the
+     *  query before executing it, replacing the generic placeholder character by the one appropriate to
+     *  the used database. Ex: when using PostgreSQL, '... WHERE FIRST_NAME = ?' may be replaced by
+     *  '... WHERE FIRST_NAME = ?::varchar(1000)'.</li>
+     *  <li>The '?' character does not need to be quoted if it appears on the query inside a string literal.
+     *  This situation is automatically detected and the substitution is not performed.</li>
+     *  <li>The number of binding wrappers passed in as last arguments of this method must match the number of
+     *  binding placeholders in the query.</li>
+     * </ul>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
+     * @param fetchLimit
+     *          Fetch limit, or null for no limit
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, Integer fetchLimit, ERXSQLBinding... bindings ) {
+        EODatabaseContext context = databaseContextForEntityName(ec,entityName);
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        EOSQLExpression expression = context.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+
+        String proceccedQuery = processedQueryString(query, expression, ec, bindings);
+        expression.setStatement(proceccedQuery);
+
+        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
+        spec.setRefreshesRefetchedObjects(refreshesCache);
+        if( fetchLimit != null ) {
+            spec.setFetchLimit( fetchLimit );
+        }
+        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        return ec.objectsWithFetchSpecification(spec);
+    }
+
+    /**
+     * Obtains a batch iterator for the objects resulting from the passed in SQL query with binded variables.
+     * <p>
+     * The requirements for the passed in SQL query are the same as {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
+     * except for an important difference: the query must return only one column with the entity primary keys.
+     * Instead of doing a query like 'SELECT * FROM Person ...', assuming ID as the name of the primary key column,
+     * the query would be 'SELECT ID FROM Person ...'. Despite this, the batch iterator will provide you the
+     * full initialized EOs.
+     * </p>
+     * <p>
+     * <strong>SORTING</strong> - If you want to obtain sorted results, you'll have to add the sorting information to
+     * the query (using ORDER BY clauses) <em>and</em> pass an array of EOSortOrderings to this method. The sorting
+     * information in the query will be used to sort the primary key array. The EOSortOrderings are used to sort objects
+     * inside each batch. To obtain sorted results as expected, both sorting criteria should be similar.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
+     * @param batchSize
+     *          The size of each batch
+     * @param sortOrderings
+     *          EOSortOrderings for batches (see description above)
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @return batch iterator for the passed in query
+     */
+    public static ERXFetchSpecificationBatchIterator batchIteratorForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, int batchSize, NSArray sortOrderings, ERXSQLBinding... bindings ) {
+        EODatabaseContext databaseContext = databaseContextForEntityName(ec,entityName);
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        if( entity.primaryKeyAttributes().count() > 1 ) {
+            throw new RuntimeException("Multiple primary keys not supported.");
+        }
+
+        EOSQLExpression expression = databaseContext.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+        expression.setStatement(processedQueryString(query, expression, ec, bindings));
+
+        EOFetchSpecification pkSpec = new EOFetchSpecification( entityName, null, null );
+        pkSpec.setRefreshesRefetchedObjects(refreshesCache);
+        pkSpec.setFetchesRawRows(true);
+        pkSpec.setRawRowKeyPaths(entity.primaryKeyAttributeNames());
+        pkSpec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        NSArray pkDicts = ec.objectsWithFetchSpecification(pkSpec);
+        NSMutableArray pks = new NSMutableArray();
+        String pkAtttributeName = ((EOAttribute) entity.primaryKeyAttributes().lastObject()).name();
+
+        for ( Enumeration rowEnumerator = pkDicts.objectEnumerator(); rowEnumerator.hasMoreElements(); ) {
+            NSDictionary row = (NSDictionary) rowEnumerator.nextElement();
+            pks.addObject( row.objectForKey( pkAtttributeName ));
+        }
+
+        EOFetchSpecification spec = new EOFetchSpecification(entityName, null, sortOrderings);
+        spec.setRefreshesRefetchedObjects( refreshesCache );
+        return new ERXFetchSpecificationBatchIterator( spec, pks, ec, batchSize);
+    }
+
+
+    /**
+     * Runs an SQL query against the database with binded variables.
+     * <p>
+     * The requirements for this method are similar to {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
+     * with the following differences:
+     * </p>
+     * <ul>
+     *   <li>The query should not return any object. This method is intended to be used with non-SELECT
+     * queries, like UPDATE, INSERT or DELETE.</li>
+     *   <li>If {@link ERXKeyValueBinding} bindings are used, the entity name must be specified in the binding constructor.</li>
+     * </ul>
+     * 
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param modelName
+     *          The name of the model (used to apply the query on the correct DB)
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     */
+    public static void runQuery( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
+        EOObjectStore osc = ec.rootObjectStore();
+        EODatabaseChannel databaseChannel = databaseContextForModelName(ec,modelName).availableChannel();
+        osc.lock();
+
+        try {
+            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+            
+            if (!adaptorChannel.isOpen()) {
+                adaptorChannel.openChannel();
+            }
+
+            // marroz: We create the expression with the original query and then set the processed query because
+            // it's the only way to create an expression without an entity.
+            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString( query );
+
+            String proceccedQuery = processedQueryString(query, expression, ec, bindings);
+            expression.setStatement(proceccedQuery);
+            
+            try {
+                adaptorChannel.evaluateExpression( expression );
+            } finally {
+                databaseChannel.cancelFetch();
+            }
+        } finally {
+            osc.unlock();
+        }
+    }
+
+    /**
+     * Runs a select query against the database, obtaining the resulting raw rows.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The
+     * method will return the resulting rows without any additional processing.
+     * </p>
+     * <p>
+     * The requirements for the passed in SQL query are the same as {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)}.
+     * </p>
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param entityName
+     *          Entity name for fetched objects.
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The requested raw rows
+     */
+    public static NSArray rawRowsForQueryOnEntity( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
+        EODatabaseChannel databaseChannel = databaseContextForEntityName(ec,entityName).availableChannel();
+        EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+        expression.setStatement( processedQueryString( query, expression, ec, bindings ) );
+
+        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
+        spec.setFetchesRawRows(true);
+        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        return ec.objectsWithFetchSpecification(spec);
+    }
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting raw rows.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The
+     * method will return the resulting rows without any additional processing. This is
+     * a variant from {@link #rowsForQueryOnEntity(EOEditingContext, String, String, ERXSQLBinding...)}
+     * that doesn't need the result rows to belong to a given entity.
+     * </p>
+     * <p>
+     * The requirements for the passed in SQL query are similar to {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)}
+     * with the following differences:
+     * </p>
+     * <ul>
+     *   <li>The query can return any arbitrary column.</li>
+     *   <li>If {@link ERXKeyValueBinding} bindings are used, the entity name must be specified in the binding constructor.</li>
+     * </ul>
+     * 
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param modelName
+     *          The name of the model (used to apply the query on the correct DB)
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The requested raw rows
+     */
+    public static NSArray rawRowsForQuery( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
+        EODatabaseContext dbContext = databaseContextForModelName(ec, modelName);
+        dbContext.lock();
+
+        try{
+            EODatabaseChannel databaseChannel = dbContext.availableChannel();
+            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+            adaptorChannel.openChannel();
+            
+            JDBCContext jdbcContext = (JDBCContext) adaptorChannel.adaptorContext();
+            Connection connection = jdbcContext.connection();
+            
+            // marroz: We create the expression with the original query and then set the processed query because
+            // it's the only way to create an expression without an entity.
+            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString(query);
+            expression.setStatement(processedQueryString(query, expression, ec, bindings));
+           
+            PreparedStatement statement = null;
+            ResultSet resultSet = null;
+            NSMutableArray<NSDictionary> resultList = new NSMutableArray<NSDictionary>(100);
+            
+            try {
+                statement = connection.prepareStatement(expression.statement());
+                
+                int index = 1;
+                for (NSDictionary<String, ? extends Object> binding : expression.bindVariableDictionaries()) {
+                    if (bindings[index - 1].isModelAttribute()) {
+                        EOAttribute attribute = (EOAttribute) binding.objectForKey(EOSQLExpression.BindVariableAttributeKey);
+                        JDBCColumn column = new JDBCColumn(attribute, (JDBCChannel)adaptorChannel);
+                        column.setStatement(statement);
+                        column.takeInputValue(binding.objectForKey(EOSQLExpression.BindVariableValueKey), index, false);
+                    } else {
+                        statement.setObject(index, binding.objectForKey(EOSQLExpression.BindVariableValueKey));
+                    }
+                    ++index;
+                }
+                
+                resultSet = statement.executeQuery();
+                
+                ResultSetMetaData metaData = resultSet.getMetaData();
+                int numColumns = metaData.getColumnCount();
+                NSMutableArray<String> columnNames = new NSMutableArray<String>(numColumns);
+
+                for (int i = 0; i < numColumns; i++) {
+                    columnNames.addObject(metaData.getColumnName(i + 1));
+                }
+                
+                _EOMutableKnownKeyDictionary.Initializer dictInitializer = new _EOMutableKnownKeyDictionary.Initializer(columnNames);
+
+                while (resultSet.next()) {
+                    _EOMutableKnownKeyDictionary result = new _EOMutableKnownKeyDictionary(dictInitializer);
+                    for (int i = 0; i < numColumns; i++) {
+                        final Object value = resultSet.getObject(i + 1);
+                        if (value != null) {
+                            result.setObjectForKey(value, columnNames.objectAtIndex(i));
+                        }
+                        else {
+                            result.setObjectForKey(NSKeyValueCoding.NullValue, columnNames.objectAtIndex(i));
+                        }
+                    }
+                    resultList.add(result);
+                }
+                return resultList;
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            } finally {
+                try {
+                    if (statement != null) {
+                        statement.close();
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                } finally {
+                    try {
+                        if (resultSet != null) {
+                            resultSet.close();
+                        }
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        } finally {
+            dbContext.unlock();
+        }
+    }
+    
+    // ==================================================
+    // Support methods
+    // --------------------------------------------------
+
+    /**
+     * Replaces the binding placeholder characters by the appropriate token for the used database.
+     * <p>
+     * This method will also register each of the bindings in the given expression.
+     * </p>
+     *
+     * @param query
+     *          The original SQL query
+     * @param expression
+     *          EOSQLExpression to be modified
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The processed query
+     */
+    protected static String processedQueryString(String query, EOSQLExpression expression, EOEditingContext ec, ERXSQLBinding... bindings) {
+        int currentOffset = 0;
+        int bindingCount = 0;
+        StringBuffer processedQueryBuffer = new StringBuffer();
+        String parsedQuery = EOModelSQLParser.sqlQueryForQuery(ec, query);
+        NSArray positions = varPositionsForQuery( parsedQuery );
+
+        if( positions.count() != bindings.length ) {
+            throw new RuntimeException("Binding placeholders count (" + positions.count() + ") does not match binding wrappers count (" + bindings.length + ").");
+        }
+
+        for ( Enumeration positionEnumerator = positions.objectEnumerator(); positionEnumerator.hasMoreElements(); ) {
+            Integer position = (Integer) positionEnumerator.nextElement();
+            if( position > currentOffset ) {
+                processedQueryBuffer.append( parsedQuery.substring( currentOffset, position ) );
+            }
+            ERXSQLBinding binding = bindings[bindingCount];
+            // The call to sqlStringForValue adds a binding to the expression binding list...
+            processedQueryBuffer.append( binding.sqlStringForBindingOnExpression(expression, ec) );
+            currentOffset = position+1;
+            bindingCount++;
+        }
+
+        if( currentOffset < parsedQuery.length() ) {
+            processedQueryBuffer.append( parsedQuery.substring( currentOffset, parsedQuery.length() ) );
+        }
+
+        String proceccedQuery = processedQueryBuffer.toString();
+        return proceccedQuery;
+    }
+
+    /**
+     * Obtains the index positions of the binding placeholders in the query.
+     * 
+     * @param query 
+     *          The SQL query
+     * @return array of placeholder index positions
+     */
+    private static NSArray varPositionsForQuery(String query) {
+        int position = 0;
+        boolean inQuote = false;
+        char quoteChar = 0;
+        NSMutableArray positions = new NSMutableArray();
+
+        while( position < query.length() ) {
+            char c = query.charAt( position );
+            if( c == '\\' ) {
+                position += 2;
+                continue;
+            }
+            if( inQuote == false && ( c == '\'' || c == '\"' ) ) {
+                quoteChar = c;
+                inQuote = true;
+            } else if( inQuote && c == quoteChar ) {
+                inQuote = false;
+            } else if( inQuote == false && c == '?' ) {
+                positions.addObject(position);
+            }
+
+            position++;
+        }
+
+        return positions;
+    }
+
+    /**
+     * Obtains the database context for the given editing context and entity name.
+     * 
+     * @param ec
+     *          Editing context
+     * @param entityName
+     *          The entity name
+     * @return The database context for the given editing context and entity name
+     */
+    private static EODatabaseContext databaseContextForEntityName( EOEditingContext ec, String entityName ) {
+        EOModelGroup group = EOUtilities.modelGroup( ec );
+        EOModel model = group.entityNamed(entityName).model();
+        if( model != null ) {
+            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
+        } else {
+            throw new RuntimeException("Entity named " + entityName + " not found in the model group.");
+        }
+    }
+    
+    /**
+     * Obtains the database context for the given editing context and model name
+     * 
+     * @param ec
+     *          Editing context
+     * @param modelName
+     *          The model name
+     * @return The database context for the given editing context and model name
+     */
+    private static EODatabaseContext databaseContextForModelName(EOEditingContext ec, String modelName) {
+        EOModelGroup group = EOUtilities.modelGroup( ec );
+        EOModel model = group.modelNamed(modelName);
+        if( model != null ) {
+            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
+        } else {
+            throw new RuntimeException("Model " + modelName + " not found in the model group.");
+        }
+    }
+
+    
+}

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java	2011-01-27 20:08:08 UTC (rev 11922)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java	2011-01-27 20:09:38 UTC (rev 11923)
@@ -1,442 +1,42 @@
 package er.extensions.eof;
 
-
-import java.util.Enumeration;
-
-import com.webobjects.eoaccess.EOAdaptorChannel;
-import com.webobjects.eoaccess.EOAttribute;
-import com.webobjects.eoaccess.EODatabaseChannel;
-import com.webobjects.eoaccess.EODatabaseContext;
-import com.webobjects.eoaccess.EOEntity;
-import com.webobjects.eoaccess.EOModel;
-import com.webobjects.eoaccess.EOModelGroup;
-import com.webobjects.eoaccess.EOModelSQLParser;
-import com.webobjects.eoaccess.EOSQLExpression;
-import com.webobjects.eoaccess.EOUtilities;
 import com.webobjects.eocontrol.EOEditingContext;
-import com.webobjects.eocontrol.EOFetchSpecification;
-import com.webobjects.eocontrol.EOObjectStore;
-import com.webobjects.eocontrol.EOSortOrdering;
 import com.webobjects.foundation.NSArray;
-import com.webobjects.foundation.NSDictionary;
-import com.webobjects.foundation.NSMutableArray;
 
 /**
- * This class allows SQL queries with binded variables to be run against the database. It's possible
- * to obtain EOs, raw rows or a batch iterator, depending on the used method.
- * <p>
- * Binded values are passed in using {@link ERXSQLBinding} implementations. Currently, there are two available
- * implementations: {@link ERXKeyValueBinding} and {@link ERXObjectBinding}. The first one should be used if
- * the binding matches a column modeled in an EOModel. This way, any data type conversions that would happen
- * on normal EOF usage are also applied when generating the SQL query. An example of this can be converting a
- * boolean value to a string or an integer. {@link ERXObjectBinding} can be used for non-modeled columns.
- * Please read the {@link ERXObjectBinding} class documentation for important notes regarding some databases
- * that expect SQL queries with binding typification.
- * </p>
- * <p>
- * This class is used by calling the most appropriate static method for the intended usage. Specific requirements
- * for the SQL query resulting columns are detailed on each of the method's documentation. Generally, you need
- * to provide a query returning the appropriate columns and using the '?' character for each binded value.
- * Depending on the database plug-in being used, the '?' character will be automatically replaced by a different
- * expression if the {@link ERXKeyValueBinding} class is used to wrap the binded value. In PostgreSQL, for instance,
- * the '?' character could be replaced by '?::varchar(1000)'.
- * </p>
- * <p>
- * Queries may be written using tokens described in {@link EOModelSQLParser}. This simplifies writing SQL queries,
- * as entity, attribute and relationship names can be used instead of table and column names.
- * </p>
- * <p>
- * Here are some sample uses of this class:
- * </p>
- * <pre>
- *   // Obtains EOs that match the query
- *   ERXSQLQueryWithBindingsUtilities.selectObjectsOfEntityForSqlWithBindings(editingContext(), Song.ENTITY_NAME,
- *     "SELECT * FROM SONG WHERE FAVORITE = ? AND DURATION > ? ORDER BY NUMBER ASC", true,
- *     new ERXKeyValueBinding("favorite", true), new ERXKeyValueBinding("duration", 120));
- *     
- *   // Obtains raw rows for query
- *   ERXSQLQueryWithBindingsUtilities.rawRowsForSqlWithBindings(editingContext(), Song.ENTITY_NAME,
- *     "SELECT t0.NAME, t0.DURATION FROM SONG t0 WHERE COMPOSER = ?", new ERXKeyValueBinding("composer", "Mozart"));
- *     
- *   // Runs a query that returns no objects, using EOModelSQLParser-style tokens
- *   ERXSQLQueryWithBindingsUtilities.runSqlQueryWithBindings(editingContext(), "SongsModel",
- *     "DELETE FROM {Song} WHERE {favorite} = ?", new ERXKeyValueBinding("favorite", false));
- *   
- *   // Obtains ERXFetchSpecificationBatchIterator
- *   // Note the query must obtain the primary key!
- *   ERXSQLQueryWithBindingsUtilities.batchIteratorForObjectsWithSqlWithBindings(editingContext(), Employee.ENTITY_NAME,
- *     "SELECT ID FROM EMPLOYEE WHERE HEIGHT < ? AND FIRST_NAME = ? ORDER BY NUMBER DESC", false, 100,
- *     new NSArray<EOSortOrdering>(new EOSortOrdering[] {new EOSortOrdering("number", EOSortOrdering.CompareDescending)}),
- *     new ERXObjectBinding(190), new ERXKeyValueBinding("firstName", "John"));
- * </pre>
+ * This class has been renamed to {@link ERXSQLQuery}, and methods got shorter names too.
+ * Use {@link ERXSQLQuery} instead of this class for new code.
  */
-public class ERXSQLQueryWithBindingsUtilities {
-
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * Please read the {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
-     * documentation for the necessary details on how to use both methods.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @see #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
-     * @return array of objects obtained by the query
-     */
+@Deprecated
+public class ERXSQLQueryWithBindingsUtilities extends ERXSQLQuery {
+    
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
-        return selectObjectsOfEntityForSqlWithBindings(ec, entityName, query, false, null, bindings);
+        return objectsForQuery(ec, entityName, query, bindings);
     }
     
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * Please read the {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
-     * documentation for the necessary details on how to use both methods.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}. 
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @see #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
-     * @return array of objects obtained by the query
-     */
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, ERXSQLBinding... bindings ) {
-        return selectObjectsOfEntityForSqlWithBindings(ec, entityName, query, refreshesCache, null, bindings);
+        return objectsForQuery(ec, entityName, query, refreshesCache, bindings);
     }
-
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * This method allows a SELECT SQL query to be run, using binded variables. The method will
-     * process the query result and return EOs of the requested entity.
-     * </p>
-     * <p>
-     * There are some important requirements regarding the passed in query:
-     * </p>
-     * <ul>
-     *  <li>The query must return all the columns of the affected table that are mapped in the modeled
-     *  Entity. 'SELECT * FROM Table ...' is the easiest way to achieve this. Alias are supported, like
-     *  'SELECT t0.* FROM Table t0 ...'.</li>
-     *  <li>The placeholder for binded variables must be the '?' character. This method will process the
-     *  query before executing it, replacing the generic placeholder character by the one appropriate to
-     *  the used database. Ex: when using PostgreSQL, '... WHERE FIRST_NAME = ?' may be replaced by
-     *  '... WHERE FIRST_NAME = ?::varchar(1000)'.</li>
-     *  <li>The '?' character does not need to be quoted if it appears on the query inside a string literal.
-     *  This situation is automatically detected and the substitution is not performed.</li>
-     *  <li>The number of binding wrappers passed in as last arguments of this method must match the number of
-     *  binding placeholders in the query.</li>
-     * </ul>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
-     * @param fetchLimit
-     *          Fetch limit, or null for no limit
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @return array of objects obtained by the query
-     */
+    
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, Integer fetchLimit, ERXSQLBinding... bindings ) {
-        EODatabaseContext context = databaseContextForEntityName(ec,entityName);
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        EOSQLExpression expression = context.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-
-        String proceccedQuery = processedQueryString(query, expression, ec, bindings);
-        expression.setStatement(proceccedQuery);
-
-        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
-        spec.setRefreshesRefetchedObjects(refreshesCache);
-        if( fetchLimit != null ) {
-            spec.setFetchLimit( fetchLimit );
-        }
-        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        return ec.objectsWithFetchSpecification(spec);
+        return objectsForQuery(ec, entityName, query, refreshesCache, fetchLimit, bindings);
     }
-
-    /**
-     * Obtains a batch iterator for the objects resulting from the passed in SQL query with binded variables.
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for an important difference: the query must return only one column with the entity primary keys.
-     * Instead of doing a query like 'SELECT * FROM Person ...', assuming ID as the name of the primary key column,
-     * the query would be 'SELECT ID FROM Person ...'. Despite this, the batch iterator will provide you the
-     * full initialized EOs.
-     * </p>
-     * <p>
-     * <strong>SORTING</strong> - If you want to obtain sorted results, you'll have to add the sorting information to
-     * the query (using ORDER BY clauses) <em>and</em> pass an array of EOSortOrderings to this method. The sorting
-     * information in the query will be used to sort the primary key array. The EOSortOrderings are used to sort objects
-     * inside each batch. To obtain sorted results as expected, both sorting criteria should be similar.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
-     * @param batchSize
-     *          The size of each batch
-     * @param sortOrderings
-     *          EOSortOrderings for batches (see description above)
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @return batch iterator for the passed in query
-     */
+    
+    @Deprecated
     public static ERXFetchSpecificationBatchIterator batchIteratorForObjectsWithSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, int batchSize, NSArray sortOrderings, ERXSQLBinding... bindings ) {
-        EODatabaseContext databaseContext = databaseContextForEntityName(ec,entityName);
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        if( entity.primaryKeyAttributes().count() > 1 ) {
-            throw new RuntimeException("Multiple primary keys not supported.");
-        }
-
-        EOSQLExpression expression = databaseContext.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-        expression.setStatement(processedQueryString(query, expression, ec, bindings));
-
-        EOFetchSpecification pkSpec = new EOFetchSpecification( entityName, null, null );
-        pkSpec.setRefreshesRefetchedObjects(refreshesCache);
-        pkSpec.setFetchesRawRows(true);
-        pkSpec.setRawRowKeyPaths(entity.primaryKeyAttributeNames());
-        pkSpec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        NSArray pkDicts = ec.objectsWithFetchSpecification(pkSpec);
-        NSMutableArray pks = new NSMutableArray();
-        String pkAtttributeName = ((EOAttribute) entity.primaryKeyAttributes().lastObject()).name();
-
-        for ( Enumeration rowEnumerator = pkDicts.objectEnumerator(); rowEnumerator.hasMoreElements(); ) {
-            NSDictionary row = (NSDictionary) rowEnumerator.nextElement();
-            pks.addObject( row.objectForKey( pkAtttributeName ));
-        }
-
-        EOFetchSpecification spec = new EOFetchSpecification(entityName, null, sortOrderings);
-        spec.setRefreshesRefetchedObjects( refreshesCache );
-        return new ERXFetchSpecificationBatchIterator( spec, pks, ec, batchSize);
+        return batchIteratorForQuery(ec, entityName, query, refreshesCache, batchSize, sortOrderings, bindings);
     }
-
-
-    /**
-     * Runs an SQL query against the database with binded variables.
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for the fact it should not return any objects. This method is intended to be used with non-SELECT
-     * queries, like UPDATE, INSERT or DELETE.
-     * </p>
-     * @param ec
-     *          The current editing context (used to obtain the correct OSC)
-     * @param modelName
-     *          The name of the model (used to apply the query on the correct DB)
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     */
+    
+    @Deprecated
     public static void runSqlQueryWithBindings( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
-        EOObjectStore osc = ec.rootObjectStore();
-        EODatabaseChannel databaseChannel = databaseContextForModelName(ec,modelName).availableChannel();
-        osc.lock();
-
-        try {
-            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
-            
-            if (!adaptorChannel.isOpen()) {
-                adaptorChannel.openChannel();
-            }
-
-            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString( query );
-
-            String proceccedQuery = processedQueryString(query, expression, ec, bindings);
-            expression.setStatement(proceccedQuery);
-
-            try {
-                adaptorChannel.evaluateExpression( expression );
-            } finally {
-                databaseChannel.cancelFetch();
-            }
-        } finally {
-            osc.unlock();
-        }
+        runQuery(ec, modelName, query, bindings);
     }
-
-    /**
-     * Runs a select query against the database, obtaining the resulting raw rows.
-     * <p>
-     * This method allows a SELECT SQL query to be run, using binded variables. The
-     * method will return the resulting rows without any additional processing.
-     * </p>
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for the fact you are free to return whatever columns you want.
-     * </p>
-     * @param ec
-     *          The current editing context (used to obtain the correct OSC)
-     * @param entityName
-     *          The name of an entity affected by the query. This does not necessarily have to be accurate,
-     *          as this value is only used to find out the correct database that the query will be run against.
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * @return The requested raw rows
-     */
+    
+    @Deprecated
     public static NSArray rawRowsForSqlWithBindings( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
-        EODatabaseChannel databaseChannel = databaseContextForEntityName(ec,entityName).availableChannel();
-        EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-        expression.setStatement( processedQueryString( query, expression, ec, bindings ) );
-
-        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
-        spec.setFetchesRawRows(true);
-        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        return ec.objectsWithFetchSpecification(spec);
+        return rawRowsForQueryOnEntity(ec, entityName, query, bindings);
     }
-
-    // ==================================================
-    // Support methods
-    // --------------------------------------------------
-
-    /**
-     * Replaces the binding placeholder characters by the appropriate token for the used database.
-     * <p>
-     * This method will also register each of the bindings in the given expression.
-     * </p>
-     *
-     * @param query
-     *          The original SQL query
-     * @param expression
-     *          EOSQLExpression to be modified
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * @return The processed query
-     */
-    protected static String processedQueryString(String query, EOSQLExpression expression, EOEditingContext ec, ERXSQLBinding... bindings) {
-        int currentOffset = 0;
-        int bindingCount = 0;
-        StringBuffer processedQueryBuffer = new StringBuffer();
-        String parsedQuery = EOModelSQLParser.sqlQueryForQuery(ec, query);
-        NSArray positions = varPositionsForQuery( parsedQuery );
-
-        if( positions.count() != bindings.length ) {
-            throw new RuntimeException("Binding placeholders count (" + positions.count() + ") does not match binding wrappers count (" + bindings.length + ").");
-        }
-
-        for ( Enumeration positionEnumerator = positions.objectEnumerator(); positionEnumerator.hasMoreElements(); ) {
-            Integer position = (Integer) positionEnumerator.nextElement();
-            if( position > currentOffset ) {
-                processedQueryBuffer.append( parsedQuery.substring( currentOffset, position ) );
-            }
-            ERXSQLBinding binding = bindings[bindingCount];
-            // The call to sqlStringForValue adds a binding to the expression binding list...
-            processedQueryBuffer.append( binding.sqlStringForBindingOnExpression(expression) );
-            currentOffset = position+1;
-            bindingCount++;
-        }
-
-        if( currentOffset < parsedQuery.length() ) {
-            processedQueryBuffer.append( parsedQuery.substring( currentOffset, parsedQuery.length() ) );
-        }
-
-        String proceccedQuery = processedQueryBuffer.toString();
-        return proceccedQuery;
-    }
-
-    /**
-     * Obtains the index positions of the binding placeholders in the query.
-     * 
-     * @param query 
-     *          The SQL query
-     * @return array of placeholder index positions
-     */
-    private static NSArray varPositionsForQuery(String query) {
-        int position = 0;
-        boolean inQuote = false;
-        char quoteChar = 0;
-        NSMutableArray positions = new NSMutableArray();
-
-        while( position < query.length() ) {
-            char c = query.charAt( position );
-            if( c == '\\' ) {
-                position += 2;
-                continue;
-            }
-            if( inQuote == false && ( c == '\'' || c == '\"' ) ) {
-                quoteChar = c;
-                inQuote = true;
-            } else if( inQuote && c == quoteChar ) {
-                inQuote = false;
-            } else if( inQuote == false && c == '?' ) {
-                positions.addObject(position);
-            }
-
-            position++;
-        }
-
-        return positions;
-    }
-
-    /**
-     * Obtains the database context for the given editing context and entity name.
-     * 
-     * @param ec
-     *          Editing context
-     * @param entityName
-     *          The entity name
-     * @return The database context for the given editing context and entity name
-     */
-    private static EODatabaseContext databaseContextForEntityName( EOEditingContext ec, String entityName ) {
-        EOModelGroup group = EOUtilities.modelGroup( ec );
-        EOModel model = group.entityNamed(entityName).model();
-        if( model != null ) {
-            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
-        } else {
-            throw new RuntimeException("Entity named " + entityName + " not found in the model group.");
-        }
-    }
-    
-    /**
-     * Obtains the database context for the given editing context and model name
-     * 
-     * @param ec
-     *          Editing context
-     * @param modelName
-     *          The model name
-     * @return The database context for the given editing context and model name
-     */
-    private static EODatabaseContext databaseContextForModelName(EOEditingContext ec, String modelName) {
-        EOModelGroup group = EOUtilities.modelGroup( ec );
-        EOModel model = group.modelNamed(modelName);
-        if( model != null ) {
-            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
-        } else {
-            throw new RuntimeException("Model " + modelName + " not found in the model group.");
-        }
-    }
-
-    
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11922
          http://wonder.svn.sourceforge.net/wonder/?rev=11922&view=rev
Author:   marroz
Date:     2011-01-27 20:08:08 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Add raw row support for arbitrary columns.
Fixed bugs.
Changed class and method names to shorter, better ones.

Modified Paths:
--------------
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java

Added Paths:
-----------
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java	2011-01-27 14:46:42 UTC (rev 11921)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKeyValueBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
@@ -1,17 +1,31 @@
 package er.extensions.eof;
 
 import com.webobjects.eoaccess.EOAttribute;
+import com.webobjects.eoaccess.EOEntity;
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eoaccess.EOUtilities;
+import com.webobjects.eocontrol.EOEditingContext;
 
 /**
  * This class models an SQL binding based on a model keypath/value pair.
  * <p>
- * The keypath refers to the base entity of the SQL expression. As an example, if the
- * base entity is Person, than a binding for person's first name would have a keypath
- * of "firstName". The name of the person's department would be "department.name". The
- * keypath is used to inspect the model and obtain the correct {@link EOAttribute} used
- * to handle SQL generation (value type, conversion, etc).
+ * When the {@link #ERXKeyValueBinding(String, Object)} constructor is used, <code>keypath</code>
+ * refers to the base entity of the SQL expression. As an example, if the base entity is
+ * Person, than a binding for person's first name would have a keypath of "firstName".
+ * The name of the person's department would be "department.name". This constructor should
+ * be used when the base entity is known. This happens on {@link ERXSQLQuery}
+ * methods that receive an entity name.
  * </p>
+ * <p>
+ * When using the {@link #ERXKeyValueBinding(String, String, Object)} constructor, <code>keypath</code>
+ * works the same way, but refers to the entity whose name is passed in as the constructor first
+ * argument. This constructor should be used when the base entity is not specified, like in
+ * {@link ERXSQLQuery#runQuery(EOEditingContext, String, String, ERXSQLBinding...)}.
+ * </p>
+ * <p>
+ * The optional entity name and keypath are used to inspect the model and obtain the correct
+ * {@link EOAttribute} used to handle SQL generation (value type, conversion, etc).
+ * </p>
  */
 public class ERXKeyValueBinding implements ERXSQLBinding {
     
@@ -26,6 +40,11 @@
     private Object _value;
     
     /**
+     * Optional entity name.
+     */
+    private String _entityName;
+    
+    /**
      * Obtains new binding wrapper for passed in EOF key and value
      * 
      * @param keyPath
@@ -37,6 +56,20 @@
         _keyPath = keyPath;
         _value = value;
     }
+    
+    /**
+     * Obtains new binding wrapper for passed in EOF key and value
+     * 
+     * @param keyPath
+     *          The EOF key
+     * @param value
+     *          The value to bind
+     */
+    public ERXKeyValueBinding( String entityName, String keyPath, Object value ) {
+        _entityName = entityName;
+        _keyPath = keyPath;
+        _value = value;
+    }
 
     /**
      * The EOF key of the wrapped binding
@@ -55,8 +88,39 @@
     public Object value() {
         return _value;
     }
+    
+    /**
+     * The optional entity name.
+     * <p>
+     * If the entity name is defined, keyPath applies to that entity and not the base SQL
+     * expression this binding will be applied to.
+     * </p>
+     * 
+     * @return The entity name, if defined. Null otherwise.
+     */
+    public String entityName() {
+        return _entityName;
+    }
 
-    public String sqlStringForBindingOnExpression(EOSQLExpression expression) {
-        return expression.sqlStringForValue( value(), keyPath() );
+    public String sqlStringForBindingOnExpression(EOSQLExpression expression, EOEditingContext ec) {
+        if (entityName() == null) {
+            if (expression.entity() == null) {
+                throw new RuntimeException("When using methods without an explicit entity name, the ERXKeyValueBinding(String entityName, String keyPath, Object value) constructor must be used.");
+            }
+            return expression.sqlStringForValue( value(), keyPath() );
+        } else {
+            // marroz: This is a very nasty trick. The rational behind this is that we want to use expression.sqlStringForValue
+            // as much as possible, to obtain the database-specific variable placeholder. We could do something simpler like
+            // ERXObjectBinding does, but we would not obtain that db-specific placeholder.
+            EOEntity oldEntity = expression.entity();
+            expression._setEntity(EOUtilities.entityNamed(ec, entityName()));
+            String result = expression.sqlStringForValue( value(), keyPath() );
+            expression._setEntity(oldEntity);
+            return result;
+        }
     }
+
+    public boolean isModelAttribute() {
+        return true;
+    }
 }

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java	2011-01-27 14:46:42 UTC (rev 11921)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
@@ -4,9 +4,9 @@
 
 import com.webobjects.eoaccess.EOAttribute;
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.foundation.NSData;
 import com.webobjects.foundation.NSDictionary;
-import com.webobjects.foundation.NSKeyValueCoding;
 import com.webobjects.foundation.NSTimestamp;
 
 /**
@@ -87,10 +87,14 @@
         _attribute = attribute;
     }
 
-    public String sqlStringForBindingOnExpression(EOSQLExpression expression) {
+    public String sqlStringForBindingOnExpression(EOSQLExpression expression, EOEditingContext ec) {
         NSDictionary binding = expression.bindVariableDictionaryForAttribute( _attribute, _value );
         expression.addBindVariableDictionary(binding);
         return (String) binding.objectForKey(EOSQLExpression.BindVariablePlaceHolderKey);
     }
+    
+    public boolean isModelAttribute() {
+        return false;
+    }
 
 }

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java	2011-01-27 14:46:42 UTC (rev 11921)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLBinding.java	2011-01-27 20:08:08 UTC (rev 11922)
@@ -1,6 +1,7 @@
 package er.extensions.eof;
 
 import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eocontrol.EOEditingContext;
 
 /**
  * Interface for binding wrapper objects.
@@ -15,5 +16,19 @@
      *          EOSQLExpression being built
      * @return the SQL placeholder string for the used DB, usually "?"
      */
-    public String sqlStringForBindingOnExpression( EOSQLExpression expression );
+    public String sqlStringForBindingOnExpression( EOSQLExpression expression, EOEditingContext ec );
+    
+    /**
+     * True if the binded attribute is an existing EOModel attribute, false otherwise.
+     * <p>
+     * A binding should return true if the binding contains enough information to know what
+     * model attribute the value will be binded to. Bindings that return true will benefit
+     * from proper type conversion, as defined in the model (for instance, converting a
+     * boolean to a string or integer).
+     * </p>
+     * 
+     * @return True if the binded attribute is an existing EOModel attribute, false otherwise.
+     */
+    public boolean isModelAttribute();
+    
 }

Added: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java	                        (rev 0)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQuery.java	2011-01-27 20:08:08 UTC (rev 11922)
@@ -0,0 +1,561 @@
+package er.extensions.eof;
+
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Enumeration;
+
+import com.webobjects.eoaccess.EOAdaptorChannel;
+import com.webobjects.eoaccess.EOAttribute;
+import com.webobjects.eoaccess.EODatabaseChannel;
+import com.webobjects.eoaccess.EODatabaseContext;
+import com.webobjects.eoaccess.EOEntity;
+import com.webobjects.eoaccess.EOModel;
+import com.webobjects.eoaccess.EOModelGroup;
+import com.webobjects.eoaccess.EOSQLExpression;
+import com.webobjects.eoaccess.EOUtilities;
+import com.webobjects.eocontrol.EOEditingContext;
+import com.webobjects.eocontrol.EOFetchSpecification;
+import com.webobjects.eocontrol.EOObjectStore;
+import com.webobjects.eocontrol._EOMutableKnownKeyDictionary;
+import com.webobjects.foundation.NSArray;
+import com.webobjects.foundation.NSDictionary;
+import com.webobjects.foundation.NSKeyValueCoding;
+import com.webobjects.foundation.NSMutableArray;
+import com.webobjects.jdbcadaptor.JDBCChannel;
+import com.webobjects.jdbcadaptor.JDBCContext;
+
+/**
+ * This class allows SQL queries with binded variables to be run against the database. It's possible
+ * to obtain EOs, raw rows or a batch iterator, depending on the used method.
+ * <p>
+ * Binded values are passed in using {@link ERXSQLBinding} implementations. Currently, there are two available
+ * implementations: {@link ERXKeyValueBinding} and {@link ERXObjectBinding}. The first one should be used if
+ * the binding matches a column modeled in an EOModel. This way, any data type conversions that would happen
+ * on normal EOF usage are also applied when generating the SQL query. An example of this can be converting a
+ * boolean value to a string or an integer. {@link ERXObjectBinding} can be used for non-modeled columns.
+ * Please read the {@link ERXObjectBinding} class documentation for important notes regarding some databases
+ * that expect SQL queries with binding typification.
+ * </p>
+ * <p>
+ * This class is used by calling the most appropriate static method for the intended usage. Specific requirements
+ * for the SQL query resulting columns are detailed on each of the method's documentation. Generally, you need
+ * to provide a query returning the appropriate columns and using the '?' character for each binded value.
+ * Depending on the database plug-in being used, the '?' character will be automatically replaced by a different
+ * expression if the {@link ERXKeyValueBinding} class is used to wrap the binded value. In PostgreSQL, for instance,
+ * the '?' character could be replaced by '?::varchar(1000)'.
+ * </p>
+ * <p>
+ * Here are some sample uses of this class:
+ * </p>
+ * <pre>
+ *   // Obtains EOs that match the query
+ *   ERXSQLQuery.objectsForQuery(editingContext(), Song.ENTITY_NAME,
+ *     "SELECT * FROM SONG WHERE FAVORITE = ? AND DURATION > ? ORDER BY NUMBER ASC", true,
+ *     new ERXKeyValueBinding("favorite", true), new ERXKeyValueBinding("duration", 120));
+ *     
+ *   // Obtains raw rows for query
+ *   ERXSQLQuery.rowsForQueryOnEntity(editingContext(), Song.ENTITY_NAME,
+ *     "SELECT t0.NAME, t0.DURATION FROM SONG t0 WHERE COMPOSER = ?", new ERXKeyValueBinding("composer", "Mozart"));
+ *     
+ *   // Runs a query that returns no objects, using EOModelSQLParser-style tokens
+ *   ERXSQLQuery.runQuery(editingContext(), "SongsModel",
+ *     "DELETE FROM SONG WHERE FAVORITE = ?", new ERXKeyValueBinding("Song", "favorite", false));
+ *   
+ *   // Obtains ERXFetchSpecificationBatchIterator
+ *   // Note the query must obtain the primary key!
+ *   ERXSQLQuery.batchIteratorForQuery(editingContext(), Employee.ENTITY_NAME,
+ *     "SELECT ID FROM EMPLOYEE WHERE HEIGHT < ? AND FIRST_NAME = ? ORDER BY NUMBER DESC", false, 100,
+ *     new NSArray<EOSortOrdering>(new EOSortOrdering[] {new EOSortOrdering("number", EOSortOrdering.CompareDescending)}),
+ *     new ERXObjectBinding(190), new ERXKeyValueBinding("firstName", "John"));
+ * </pre>
+ */
+public class ERXSQLQuery {
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * Please read the {@link #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
+     * documentation for the necessary details on how to use both methods.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @see #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
+        return objectsForQuery(ec, entityName, query, false, null, bindings);
+    }
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * Please read the {@link #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
+     * documentation for the necessary details on how to use both methods.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}. 
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @see #objectsForQuery(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, ERXSQLBinding... bindings ) {
+        return objectsForQuery(ec, entityName, query, refreshesCache, null, bindings);
+    }
+
+    /**
+     * Runs a select query against the database, obtaining the resulting EOs.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The method will
+     * process the query result and return EOs of the requested entity.
+     * </p>
+     * <p>
+     * There are some important requirements regarding the passed in query:
+     * </p>
+     * <ul>
+     *  <li>The query must return all the columns of the affected table that are mapped in the modeled
+     *  Entity. 'SELECT * FROM Table ...' is the easiest way to achieve this. Alias are supported, like
+     *  'SELECT t0.* FROM Table t0 ...'.</li>
+     *  <li>The placeholder for binded variables must be the '?' character. This method will process the
+     *  query before executing it, replacing the generic placeholder character by the one appropriate to
+     *  the used database. Ex: when using PostgreSQL, '... WHERE FIRST_NAME = ?' may be replaced by
+     *  '... WHERE FIRST_NAME = ?::varchar(1000)'.</li>
+     *  <li>The '?' character does not need to be quoted if it appears on the query inside a string literal.
+     *  This situation is automatically detected and the substitution is not performed.</li>
+     *  <li>The number of binding wrappers passed in as last arguments of this method must match the number of
+     *  binding placeholders in the query.</li>
+     * </ul>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
+     * @param fetchLimit
+     *          Fetch limit, or null for no limit
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @return array of objects obtained by the query
+     */
+    public static NSArray objectsForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, Integer fetchLimit, ERXSQLBinding... bindings ) {
+        EODatabaseContext context = databaseContextForEntityName(ec,entityName);
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        EOSQLExpression expression = context.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+
+        String proceccedQuery = processedQueryString(query, expression, ec, bindings);
+        expression.setStatement(proceccedQuery);
+
+        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
+        spec.setRefreshesRefetchedObjects(refreshesCache);
+        if( fetchLimit != null ) {
+            spec.setFetchLimit( fetchLimit );
+        }
+        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        return ec.objectsWithFetchSpecification(spec);
+    }
+
+    /**
+     * Obtains a batch iterator for the objects resulting from the passed in SQL query with binded variables.
+     * <p>
+     * The requirements for the passed in SQL query are the same as {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
+     * except for an important difference: the query must return only one column with the entity primary keys.
+     * Instead of doing a query like 'SELECT * FROM Person ...', assuming ID as the name of the primary key column,
+     * the query would be 'SELECT ID FROM Person ...'. Despite this, the batch iterator will provide you the
+     * full initialized EOs.
+     * </p>
+     * <p>
+     * <strong>SORTING</strong> - If you want to obtain sorted results, you'll have to add the sorting information to
+     * the query (using ORDER BY clauses) <em>and</em> pass an array of EOSortOrderings to this method. The sorting
+     * information in the query will be used to sort the primary key array. The EOSortOrderings are used to sort objects
+     * inside each batch. To obtain sorted results as expected, both sorting criteria should be similar.
+     * </p>
+     * @param ec
+     *          The editing context where the objects will be placed
+     * @param entityName
+     *          The name of the entity whose objects are returned by the query
+     * @param query
+     *          The SQL query
+     * @param refreshesCache
+     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
+     * @param batchSize
+     *          The size of each batch
+     * @param sortOrderings
+     *          EOSortOrderings for batches (see description above)
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * 
+     * @return batch iterator for the passed in query
+     */
+    public static ERXFetchSpecificationBatchIterator batchIteratorForQuery( EOEditingContext ec, String entityName, String query, boolean refreshesCache, int batchSize, NSArray sortOrderings, ERXSQLBinding... bindings ) {
+        EODatabaseContext databaseContext = databaseContextForEntityName(ec,entityName);
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        if( entity.primaryKeyAttributes().count() > 1 ) {
+            throw new RuntimeException("Multiple primary keys not supported.");
+        }
+
+        EOSQLExpression expression = databaseContext.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+        expression.setStatement(processedQueryString(query, expression, ec, bindings));
+
+        EOFetchSpecification pkSpec = new EOFetchSpecification( entityName, null, null );
+        pkSpec.setRefreshesRefetchedObjects(refreshesCache);
+        pkSpec.setFetchesRawRows(true);
+        pkSpec.setRawRowKeyPaths(entity.primaryKeyAttributeNames());
+        pkSpec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        NSArray pkDicts = ec.objectsWithFetchSpecification(pkSpec);
+        NSMutableArray pks = new NSMutableArray();
+        String pkAtttributeName = ((EOAttribute) entity.primaryKeyAttributes().lastObject()).name();
+
+        for ( Enumeration rowEnumerator = pkDicts.objectEnumerator(); rowEnumerator.hasMoreElements(); ) {
+            NSDictionary row = (NSDictionary) rowEnumerator.nextElement();
+            pks.addObject( row.objectForKey( pkAtttributeName ));
+        }
+
+        EOFetchSpecification spec = new EOFetchSpecification(entityName, null, sortOrderings);
+        spec.setRefreshesRefetchedObjects( refreshesCache );
+        return new ERXFetchSpecificationBatchIterator( spec, pks, ec, batchSize);
+    }
+
+
+    /**
+     * Runs an SQL query against the database with binded variables.
+     * <p>
+     * The requirements for this method are similar to {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
+     * with the following differences:
+     * </p>
+     * <ul>
+     *   <li>The query should not return any object. This method is intended to be used with non-SELECT
+     * queries, like UPDATE, INSERT or DELETE.</li>
+     *   <li>If {@link ERXKeyValueBinding} bindings are used, the entity name must be specified in the binding constructor.</li>
+     * </ul>
+     * 
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param modelName
+     *          The name of the model (used to apply the query on the correct DB)
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     */
+    public static void runQuery( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
+        EOObjectStore osc = ec.rootObjectStore();
+        EODatabaseChannel databaseChannel = databaseContextForModelName(ec,modelName).availableChannel();
+        osc.lock();
+
+        try {
+            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+            
+            if (!adaptorChannel.isOpen()) {
+                adaptorChannel.openChannel();
+            }
+
+            // marroz: We create the expression with the original query and then set the processed query because
+            // it's the only way to create an expression without an entity.
+            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString( query );
+
+            String proceccedQuery = processedQueryString(query, expression, ec, bindings);
+            expression.setStatement(proceccedQuery);
+            
+            try {
+                adaptorChannel.evaluateExpression( expression );
+            } finally {
+                databaseChannel.cancelFetch();
+            }
+        } finally {
+            osc.unlock();
+        }
+    }
+
+    /**
+     * Runs a select query against the database, obtaining the resulting raw rows.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The
+     * method will return the resulting rows without any additional processing.
+     * </p>
+     * <p>
+     * The requirements for the passed in SQL query are the same as {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)}.
+     * </p>
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param entityName
+     *          Entity name for fetched objects.
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The requested raw rows
+     */
+    public static NSArray rawRowsForQueryOnEntity( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
+        EODatabaseChannel databaseChannel = databaseContextForEntityName(ec,entityName).availableChannel();
+        EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
+
+        EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
+        expression.setStatement( processedQueryString( query, expression, ec, bindings ) );
+
+        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
+        spec.setFetchesRawRows(true);
+        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
+
+        return ec.objectsWithFetchSpecification(spec);
+    }
+    
+    /**
+     * Runs a select query against the database, obtaining the resulting raw rows.
+     * <p>
+     * This method allows a SELECT SQL query to be run, using binded variables. The
+     * method will return the resulting rows without any additional processing. This is
+     * a variant from {@link #rowsForQueryOnEntity(EOEditingContext, String, String, ERXSQLBinding...)}
+     * that doesn't need the result rows to belong to a given entity.
+     * </p>
+     * <p>
+     * The requirements for the passed in SQL query are similar to {@link #objectsForQuery(EOEditingContext, String, String, boolean, ERXSQLBinding...)}
+     * with the following differences:
+     * </p>
+     * <ul>
+     *   <li>The query can return any arbitrary column.</li>
+     *   <li>If {@link ERXKeyValueBinding} bindings are used, the entity name must be specified in the binding constructor.</li>
+     * </ul>
+     * <p>
+     * <strong>NOTE:</strong> On the 5.2 version, this method will not respect model-based type conversions when using
+     * {@link ERXKeyValueBinding}. That feature is only available on 5.4.
+     * </p>
+     * 
+     * @param ec
+     *          The current editing context (used to obtain the correct OSC)
+     * @param modelName
+     *          The name of the model (used to apply the query on the correct DB)
+     * @param query
+     *          The SQL query
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The requested raw rows
+     */
+    public static NSArray rawRowsForQuery( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
+        EODatabaseContext dbContext = databaseContextForModelName(ec, modelName);
+        dbContext.lock();
+
+        try{
+            EODatabaseChannel databaseChannel = dbContext.availableChannel();
+            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
+            adaptorChannel.openChannel();
+            
+            JDBCContext jdbcContext = (JDBCContext) adaptorChannel.adaptorContext();
+            Connection connection = jdbcContext.connection();
+            
+            // marroz: We create the expression with the original query and then set the processed query because
+            // it's the only way to create an expression without an entity.
+            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString(query);
+            expression.setStatement(processedQueryString(query, expression, ec, bindings));
+           
+            PreparedStatement statement = null;
+            ResultSet resultSet = null;
+            NSMutableArray resultList = new NSMutableArray(100);
+            
+            try {
+                statement = connection.prepareStatement(expression.statement());
+                
+                int index = 1;
+                for (Enumeration bindingEnumerator = expression.bindVariableDictionaries().objectEnumerator(); bindingEnumerator.hasMoreElements(); ) {
+                    NSDictionary binding = (NSDictionary) bindingEnumerator.nextElement();
+                    statement.setObject(index, binding.objectForKey(EOSQLExpression.BindVariableValueKey));
+                    ++index;
+                }
+                
+                resultSet = statement.executeQuery();
+                
+                ResultSetMetaData metaData = resultSet.getMetaData();
+                int numColumns = metaData.getColumnCount();
+                NSMutableArray columnNames = new NSMutableArray(numColumns);
+
+                for (int i = 0; i < numColumns; i++) {
+                    columnNames.addObject(metaData.getColumnName(i + 1));
+                }
+                
+                _EOMutableKnownKeyDictionary.Initializer dictInitializer = new _EOMutableKnownKeyDictionary.Initializer(columnNames);
+
+                while (resultSet.next()) {
+                    _EOMutableKnownKeyDictionary result = new _EOMutableKnownKeyDictionary(dictInitializer);
+                    for (int i = 0; i < numColumns; i++) {
+                        final Object value = resultSet.getObject(i + 1);
+                        if (value != null) {
+                            result.setObjectForKey(value, columnNames.objectAtIndex(i));
+                        }
+                        else {
+                            result.setObjectForKey(NSKeyValueCoding.NullValue, columnNames.objectAtIndex(i));
+                        }
+                    }
+                    resultList.addObject(result);
+                }
+                return resultList;
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            } finally {
+                try {
+                    if (statement != null) {
+                        statement.close();
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                } finally {
+                    try {
+                        if (resultSet != null) {
+                            resultSet.close();
+                        }
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        } finally {
+            dbContext.unlock();
+        }
+    }
+    
+    // ==================================================
+    // Support methods
+    // --------------------------------------------------
+
+    /**
+     * Replaces the binding placeholder characters by the appropriate token for the used database.
+     * <p>
+     * This method will also register each of the bindings in the given expression.
+     * </p>
+     *
+     * @param query
+     *          The original SQL query
+     * @param expression
+     *          EOSQLExpression to be modified
+     * @param bindings
+     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
+     * @return The processed query
+     */
+    protected static String processedQueryString(String query, EOSQLExpression expression, EOEditingContext ec, ERXSQLBinding... bindings) {
+        int currentOffset = 0;
+        int bindingCount = 0;
+        StringBuffer processedQueryBuffer = new StringBuffer();
+        NSArray positions = varPositionsForQuery( query );
+
+        if( positions.count() != bindings.length ) {
+            throw new RuntimeException("Binding placeholders count (" + positions.count() + ") does not match binding wrappers count (" + bindings.length + ").");
+        }
+
+        for ( Enumeration positionEnumerator = positions.objectEnumerator(); positionEnumerator.hasMoreElements(); ) {
+            Integer position = (Integer) positionEnumerator.nextElement();
+            if( position > currentOffset ) {
+                processedQueryBuffer.append( query.substring( currentOffset, position ) );
+            }
+            ERXSQLBinding binding = bindings[bindingCount];
+            // The call to sqlStringForValue adds a binding to the expression binding list...
+            processedQueryBuffer.append( binding.sqlStringForBindingOnExpression(expression, ec) );
+            currentOffset = position+1;
+            bindingCount++;
+        }
+
+        if( currentOffset < query.length() ) {
+            processedQueryBuffer.append( query.substring( currentOffset, query.length() ) );
+        }
+
+        String proceccedQuery = processedQueryBuffer.toString();
+        return proceccedQuery;
+    }
+
+    /**
+     * Obtains the index positions of the binding placeholders in the query.
+     * 
+     * @param query 
+     *          The SQL query
+     * @return array of placeholder index positions
+     */
+    private static NSArray varPositionsForQuery(String query) {
+        int position = 0;
+        boolean inQuote = false;
+        char quoteChar = 0;
+        NSMutableArray positions = new NSMutableArray();
+
+        while( position < query.length() ) {
+            char c = query.charAt( position );
+            if( c == '\\' ) {
+                position += 2;
+                continue;
+            }
+            if( inQuote == false && ( c == '\'' || c == '\"' ) ) {
+                quoteChar = c;
+                inQuote = true;
+            } else if( inQuote && c == quoteChar ) {
+                inQuote = false;
+            } else if( inQuote == false && c == '?' ) {
+                positions.addObject(position);
+            }
+
+            position++;
+        }
+
+        return positions;
+    }
+
+    /**
+     * Obtains the database context for the given editing context and entity name.
+     * 
+     * @param ec
+     *          Editing context
+     * @param entityName
+     *          The entity name
+     * @return The database context for the given editing context and entity name
+     */
+    private static EODatabaseContext databaseContextForEntityName( EOEditingContext ec, String entityName ) {
+        EOModelGroup group = EOUtilities.modelGroup( ec );
+        EOModel model = group.entityNamed(entityName).model();
+        if( model != null ) {
+            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
+        } else {
+            throw new RuntimeException("Entity named " + entityName + " not found in the model group.");
+        }
+    }
+    
+    /**
+     * Obtains the database context for the given editing context and model name
+     * 
+     * @param ec
+     *          Editing context
+     * @param modelName
+     *          The model name
+     * @return The database context for the given editing context and model name
+     */
+    private static EODatabaseContext databaseContextForModelName(EOEditingContext ec, String modelName) {
+        EOModelGroup group = EOUtilities.modelGroup( ec );
+        EOModel model = group.modelNamed(modelName);
+        if( model != null ) {
+            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
+        } else {
+            throw new RuntimeException("Model " + modelName + " not found in the model group.");
+        }
+    }
+
+    
+}

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java	2011-01-27 14:46:42 UTC (rev 11921)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSQLQueryWithBindingsUtilities.java	2011-01-27 20:08:08 UTC (rev 11922)
@@ -1,436 +1,42 @@
 package er.extensions.eof;
 
-
-import java.util.Enumeration;
-
-import com.webobjects.eoaccess.EOAdaptorChannel;
-import com.webobjects.eoaccess.EOAttribute;
-import com.webobjects.eoaccess.EODatabaseChannel;
-import com.webobjects.eoaccess.EODatabaseContext;
-import com.webobjects.eoaccess.EOEntity;
-import com.webobjects.eoaccess.EOModel;
-import com.webobjects.eoaccess.EOModelGroup;
-import com.webobjects.eoaccess.EOSQLExpression;
-import com.webobjects.eoaccess.EOUtilities;
 import com.webobjects.eocontrol.EOEditingContext;
-import com.webobjects.eocontrol.EOFetchSpecification;
-import com.webobjects.eocontrol.EOObjectStore;
-import com.webobjects.eocontrol.EOSortOrdering;
 import com.webobjects.foundation.NSArray;
-import com.webobjects.foundation.NSDictionary;
-import com.webobjects.foundation.NSMutableArray;
 
 /**
- * This class allows SQL queries with binded variables to be run against the database. It's possible
- * to obtain EOs, raw rows or a batch iterator, depending on the used method.
- * <p>
- * Binded values are passed in using {@link ERXSQLBinding} implementations. Currently, there are two available
- * implementations: {@link ERXKeyValueBinding} and {@link ERXObjectBinding}. The first one should be used if
- * the binding matches a column modeled in an EOModel. This way, any data type conversions that would happen
- * on normal EOF usage are also applied when generating the SQL query. An example of this can be converting a
- * boolean value to a string or an integer. {@link ERXObjectBinding} can be used for non-modeled columns.
- * Please read the {@link ERXObjectBinding} class documentation for important notes regarding some databases
- * that expect SQL queries with binding typification.
- * </p>
- * <p>
- * This class is used by calling the most appropriate static method for the intended usage. Specific requirements
- * for the SQL query resulting columns are detailed on each of the method's documentation. Generally, you need
- * to provide a query returning the appropriate columns and using the '?' character for each binded value.
- * Depending on the database plug-in being used, the '?' character will be automatically replaced by a different
- * expression if the {@link ERXKeyValueBinding} class is used to wrap the binded value. In PostgreSQL, for instance,
- * the '?' character could be replaced by '?::varchar(1000)'.
- * </p>
- * <p>
- * Here are some sample uses of this class:
- * </p>
- * <pre>
- *   // Obtains EOs that match the query
- *   ERXSQLQueryWithBindingsUtilities.selectObjectsOfEntityForSqlWithBindings(editingContext(), Song.ENTITY_NAME,
- *     "SELECT * FROM SONG WHERE FAVORITE = ? AND DURATION > ? ORDER BY NUMBER ASC", true,
- *     new ERXKeyValueBinding("favorite", true), new ERXKeyValueBinding("duration", 120));
- *     
- *   // Obtains raw rows for query
- *   ERXSQLQueryWithBindingsUtilities.rawRowsForSqlWithBindings(editingContext(), Song.ENTITY_NAME,
- *     "SELECT t0.NAME, t0.DURATION FROM SONG t0 WHERE COMPOSER = ?", new ERXKeyValueBinding("composer", "Mozart"));
- *     
- *   // Runs a query that returns no objects
- *   ERXSQLQueryWithBindingsUtilities.runSqlQueryWithBindings(editingContext(), "SongsModel",
- *     "DELETE FROM SONG WHERE FAVORITE = ?", new ERXKeyValueBinding("favorite", false));
- *   
- *   // Obtains ERXFetchSpecificationBatchIterator
- *   // Note the query must obtain the primary key!
- *   ERXSQLQueryWithBindingsUtilities.batchIteratorForObjectsWithSqlWithBindings(editingContext(), Employee.ENTITY_NAME,
- *     "SELECT ID FROM EMPLOYEE WHERE HEIGHT < ? AND FIRST_NAME = ? ORDER BY NUMBER DESC", false, 100,
- *     new NSArray<EOSortOrdering>(new EOSortOrdering[] {new EOSortOrdering("number", EOSortOrdering.CompareDescending)}),
- *     new ERXObjectBinding(190), new ERXKeyValueBinding("firstName", "John"));
- * </pre>
+ * This class has been renamed to {@link ERXSQLQuery}, and methods got shorter names too.
+ * Use {@link ERXSQLQuery} instead of this class for new code.
  */
-public class ERXSQLQueryWithBindingsUtilities {
-
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * Please read the {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
-     * documentation for the necessary details on how to use both methods.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @see #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
-     * @return array of objects obtained by the query
-     */
+@Deprecated
+public class ERXSQLQueryWithBindingsUtilities extends ERXSQLQuery {
+    
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
-        return selectObjectsOfEntityForSqlWithBindings(ec, entityName, query, false, null, bindings);
+        return objectsForQuery(ec, entityName, query, bindings);
     }
     
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * Please read the {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)}
-     * documentation for the necessary details on how to use both methods.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}. 
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @see #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, Integer, ERXSQLBinding...)
-     * @return array of objects obtained by the query
-     */
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, ERXSQLBinding... bindings ) {
-        return selectObjectsOfEntityForSqlWithBindings(ec, entityName, query, refreshesCache, null, bindings);
+        return objectsForQuery(ec, entityName, query, refreshesCache, bindings);
     }
-
-    /**
-     * Runs a select query against the database, obtaining the resulting EOs.
-     * <p>
-     * This method allows a SELECT SQL query to be run, using binded variables. The method will
-     * process the query result and return EOs of the requested entity.
-     * </p>
-     * <p>
-     * There are some important requirements regarding the passed in query:
-     * </p>
-     * <ul>
-     *  <li>The query must return all the columns of the affected table that are mapped in the modeled
-     *  Entity. 'SELECT * FROM Table ...' is the easiest way to achieve this. Alias are supported, like
-     *  'SELECT t0.* FROM Table t0 ...'.</li>
-     *  <li>The placeholder for binded variables must be the '?' character. This method will process the
-     *  query before executing it, replacing the generic placeholder character by the one appropriate to
-     *  the used database. Ex: when using PostgreSQL, '... WHERE FIRST_NAME = ?' may be replaced by
-     *  '... WHERE FIRST_NAME = ?::varchar(1000)'.</li>
-     *  <li>The '?' character does not need to be quoted if it appears on the query inside a string literal.
-     *  This situation is automatically detected and the substitution is not performed.</li>
-     *  <li>The number of binding wrappers passed in as last arguments of this method must match the number of
-     *  binding placeholders in the query.</li>
-     * </ul>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
-     * @param fetchLimit
-     *          Fetch limit, or null for no limit
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @return array of objects obtained by the query
-     */
+    
+    @Deprecated
     public static NSArray selectObjectsOfEntityForSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, Integer fetchLimit, ERXSQLBinding... bindings ) {
-        EODatabaseContext context = databaseContextForEntityName(ec,entityName);
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        EOSQLExpression expression = context.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-
-        String proceccedQuery = processedQueryString(query, expression, bindings);
-        expression.setStatement(proceccedQuery);
-
-        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
-        spec.setRefreshesRefetchedObjects(refreshesCache);
-        if( fetchLimit != null ) {
-            spec.setFetchLimit( fetchLimit );
-        }
-        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        return ec.objectsWithFetchSpecification(spec);
+        return objectsForQuery(ec, entityName, query, refreshesCache, fetchLimit, bindings);
     }
-
-    /**
-     * Obtains a batch iterator for the objects resulting from the passed in SQL query with binded variables.
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for an important difference: the query must return only one column with the entity primary keys.
-     * Instead of doing a query like 'SELECT * FROM Person ...', assuming ID as the name of the primary key column,
-     * the query would be 'SELECT ID FROM Person ...'. Despite this, the batch iterator will provide you the
-     * full initialized EOs.
-     * </p>
-     * <p>
-     * <strong>SORTING</strong> - If you want to obtain sorted results, you'll have to add the sorting information to
-     * the query (using ORDER BY clauses) <em>and</em> pass an array of EOSortOrderings to this method. The sorting
-     * information in the query will be used to sort the primary key array. The EOSortOrderings are used to sort objects
-     * inside each batch. To obtain sorted results as expected, both sorting criteria should be similar.
-     * </p>
-     * @param ec
-     *          The editing context where the objects will be placed
-     * @param entityName
-     *          The name of the entity whose objects are returned by the query
-     * @param query
-     *          The SQL query
-     * @param refreshesCache
-     *          If true, the cached snapshots will be refreshed. See {@link EOFetchSpecification#setRefreshesRefetchedObjects(boolean)}.
-     * @param batchSize
-     *          The size of each batch
-     * @param sortOrderings
-     *          EOSortOrderings for batches (see description above)
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * 
-     * @return batch iterator for the passed in query
-     */
+    
+    @Deprecated
     public static ERXFetchSpecificationBatchIterator batchIteratorForObjectsWithSqlWithBindings( EOEditingContext ec, String entityName, String query, boolean refreshesCache, int batchSize, NSArray sortOrderings, ERXSQLBinding... bindings ) {
-        EODatabaseContext databaseContext = databaseContextForEntityName(ec,entityName);
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        if( entity.primaryKeyAttributes().count() > 1 ) {
-            throw new RuntimeException("Multiple primary keys not supported.");
-        }
-
-        EOSQLExpression expression = databaseContext.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-        expression.setStatement(processedQueryString(query, expression, bindings));
-
-        EOFetchSpecification pkSpec = new EOFetchSpecification( entityName, null, null );
-        pkSpec.setRefreshesRefetchedObjects(refreshesCache);
-        pkSpec.setFetchesRawRows(true);
-        pkSpec.setRawRowKeyPaths(entity.primaryKeyAttributeNames());
-        pkSpec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        NSArray pkDicts = ec.objectsWithFetchSpecification(pkSpec);
-        NSMutableArray pks = new NSMutableArray();
-        String pkAtttributeName = ((EOAttribute) entity.primaryKeyAttributes().lastObject()).name();
-
-        for ( Enumeration rowEnumerator = pkDicts.objectEnumerator(); rowEnumerator.hasMoreElements(); ) {
-            NSDictionary row = (NSDictionary) rowEnumerator.nextElement();
-            pks.addObject( row.objectForKey( pkAtttributeName ));
-        }
-
-        EOFetchSpecification spec = new EOFetchSpecification(entityName, null, sortOrderings);
-        spec.setRefreshesRefetchedObjects( refreshesCache );
-        return new ERXFetchSpecificationBatchIterator( spec, pks, ec, batchSize);
+        return batchIteratorForQuery(ec, entityName, query, refreshesCache, batchSize, sortOrderings, bindings);
     }
-
-
-    /**
-     * Runs an SQL query against the database with binded variables.
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for the fact it should not return any objects. This method is intended to be used with non-SELECT
-     * queries, like UPDATE, INSERT or DELETE.
-     * </p>
-     * @param ec
-     *          The current editing context (used to obtain the correct OSC)
-     * @param modelName
-     *          The name of the model (used to apply the query on the correct DB)
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     */
+    
+    @Deprecated
     public static void runSqlQueryWithBindings( EOEditingContext ec, String modelName, String query, ERXSQLBinding... bindings ) {
-        EOObjectStore osc = ec.rootObjectStore();
-        EODatabaseChannel databaseChannel = databaseContextForModelName(ec,modelName).availableChannel();
-        osc.lock();
-
-        try {
-            EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
-            
-            if (!adaptorChannel.isOpen()) {
-                adaptorChannel.openChannel();
-            }
-
-            EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForString( query );
-
-            String proceccedQuery = processedQueryString(query, expression, bindings);
-            expression.setStatement(proceccedQuery);
-
-            try {
-                adaptorChannel.evaluateExpression( expression );
-            } finally {
-                databaseChannel.cancelFetch();
-            }
-        } finally {
-            osc.unlock();
-        }
+        runQuery(ec, modelName, query, bindings);
     }
-
-    /**
-     * Runs a select query against the database, obtaining the resulting raw rows.
-     * <p>
-     * This method allows a SELECT SQL query to be run, using binded variables. The
-     * method will return the resulting rows without any additional processing.
-     * </p>
-     * <p>
-     * The requirements for the passed in SQL query are the same as {@link #selectObjectsOfEntityForSqlWithBindings(EOEditingContext, String, String, boolean, ERXSQLBinding...)},
-     * except for the fact you are free to return whatever columns you want.
-     * </p>
-     * @param ec
-     *          The current editing context (used to obtain the correct OSC)
-     * @param entityName
-     *          The name of an entity affected by the query. This does not necessarily have to be accurate,
-     *          as this value is only used to find out the correct database that the query will be run against.
-     * @param query
-     *          The SQL query
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * @return The requested raw rows
-     */
+    
+    @Deprecated
     public static NSArray rawRowsForSqlWithBindings( EOEditingContext ec, String entityName, String query, ERXSQLBinding... bindings ) {
-        EODatabaseChannel databaseChannel = databaseContextForEntityName(ec,entityName).availableChannel();
-        EOAdaptorChannel adaptorChannel = databaseChannel.adaptorChannel();
-        EOEntity entity = EOUtilities.entityNamed(ec, entityName);
-
-        EOSQLExpression expression = adaptorChannel.adaptorContext().adaptor().expressionFactory().expressionForEntity( entity );
-        expression.setStatement( processedQueryString( query, expression, bindings ) );
-
-        EOFetchSpecification spec = new EOFetchSpecification( entityName, null, null );
-        spec.setFetchesRawRows(true);
-        spec.setHints( new NSDictionary( expression, EODatabaseContext.CustomQueryExpressionHintKey ) );
-
-        return ec.objectsWithFetchSpecification(spec);
+        return rawRowsForQueryOnEntity(ec, entityName, query, bindings);
     }
-
-    // ==================================================
-    // Support methods
-    // --------------------------------------------------
-
-    /**
-     * Replaces the binding placeholder characters by the appropriate token for the used database.
-     * <p>
-     * This method will also register each of the bindings in the given expression.
-     * </p>
-     *
-     * @param query
-     *          The original SQL query
-     * @param expression
-     *          EOSQLExpression to be modified
-     * @param bindings
-     *          The variable bindings, wrapped in {@link ERXSQLBinding} objects
-     * @return The processed query
-     */
-    protected static String processedQueryString(String query, EOSQLExpression expression, ERXSQLBinding... bindings) {
-        int currentOffset = 0;
-        int bindingCount = 0;
-        StringBuffer processedQueryBuffer = new StringBuffer();
-        NSArray positions = varPositionsForQuery( query );
-
-        if( positions.count() != bindings.length ) {
-            throw new RuntimeException("Binding placeholders count (" + positions.count() + ") does not match binding wrappers count (" + bindings.length + ").");
-        }
-
-        for ( Enumeration positionEnumerator = positions.objectEnumerator(); positionEnumerator.hasMoreElements(); ) {
-            Integer position = (Integer) positionEnumerator.nextElement();
-            if( position > currentOffset ) {
-                processedQueryBuffer.append( query.substring( currentOffset, position ) );
-            }
-            ERXSQLBinding binding = bindings[bindingCount];
-            // The call to sqlStringForValue adds a binding to the expression binding list...
-            processedQueryBuffer.append( binding.sqlStringForBindingOnExpression(expression) );
-            currentOffset = position+1;
-            bindingCount++;
-        }
-
-        if( currentOffset < query.length() ) {
-            processedQueryBuffer.append( query.substring( currentOffset, query.length() ) );
-        }
-
-        String proceccedQuery = processedQueryBuffer.toString();
-        return proceccedQuery;
-    }
-
-    /**
-     * Obtains the index positions of the binding placeholders in the query.
-     * 
-     * @param query 
-     *          The SQL query
-     * @return array of placeholder index positions
-     */
-    private static NSArray varPositionsForQuery(String query) {
-        int position = 0;
-        boolean inQuote = false;
-        char quoteChar = 0;
-        NSMutableArray positions = new NSMutableArray();
-
-        while( position < query.length() ) {
-            char c = query.charAt( position );
-            if( c == '\\' ) {
-                position += 2;
-                continue;
-            }
-            if( inQuote == false && ( c == '\'' || c == '\"' ) ) {
-                quoteChar = c;
-                inQuote = true;
-            } else if( inQuote && c == quoteChar ) {
-                inQuote = false;
-            } else if( inQuote == false && c == '?' ) {
-                positions.addObject(position);
-            }
-
-            position++;
-        }
-
-        return positions;
-    }
-
-    /**
-     * Obtains the database context for the given editing context and entity name.
-     * 
-     * @param ec
-     *          Editing context
-     * @param entityName
-     *          The entity name
-     * @return The database context for the given editing context and entity name
-     */
-    private static EODatabaseContext databaseContextForEntityName( EOEditingContext ec, String entityName ) {
-        EOModelGroup group = EOUtilities.modelGroup( ec );
-        EOModel model = group.entityNamed(entityName).model();
-        if( model != null ) {
-            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
-        } else {
-            throw new RuntimeException("Entity named " + entityName + " not found in the model group.");
-        }
-    }
-    
-    /**
-     * Obtains the database context for the given editing context and model name
-     * 
-     * @param ec
-     *          Editing context
-     * @param modelName
-     *          The model name
-     * @return The database context for the given editing context and model name
-     */
-    private static EODatabaseContext databaseContextForModelName(EOEditingContext ec, String modelName) {
-        EOModelGroup group = EOUtilities.modelGroup( ec );
-        EOModel model = group.modelNamed(modelName);
-        if( model != null ) {
-            return EODatabaseContext.registeredDatabaseContextForModel(model, ec);
-        } else {
-            throw new RuntimeException("Model " + modelName + " not found in the model group.");
-        }
-    }
-
-    
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11921
          http://wonder.svn.sourceforge.net/wonder/?rev=11921&view=rev
Author:   davidleber
Date:     2011-01-27 14:46:42 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Removed annoying link outline in Firefox

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin/WebServerResources/default_screen_stylesheet.css

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin/WebServerResources/default_screen_stylesheet.css
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin/WebServerResources/default_screen_stylesheet.css	2011-01-27 13:41:13 UTC (rev 11920)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDefaultSkin/WebServerResources/default_screen_stylesheet.css	2011-01-27 14:46:42 UTC (rev 11921)
@@ -17,6 +17,7 @@
 a {
 	color: #4262a1;
 	text-decoration: none;
+	outline: none;
 }
 
 label {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11920
          http://wonder.svn.sourceforge.net/wonder/?rev=11920&view=rev
Author:   davidleber
Date:     2011-01-27 13:41:13 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Default buttons on list, inspect, and query pages can controlled with 'shouldShowDefaultPageButtons' key, default is 'true'.

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.html
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.wod
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.html
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.wod
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.html
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.wod
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.html	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.html	2011-01-27 13:41:13 UTC (rev 11920)
@@ -2,11 +2,13 @@
   <webobject name = "RequiredWrapper">
     <webobject name = "ShowTopActionBlock">
       <webobject name = "TopActionBlock">
+      <webobject name="ShouldShowDefaultPageButtons">
         <webobject name = "ShowCancel">
           <ul class = "ActionList">
             <li><webobject name = "ReturnButton" /></li>
           </ul>
         </webobject>
+        </webobject>
         <webobject name = "SecondaryActionBlock" />
       </webobject>
     </webobject>
@@ -21,11 +23,13 @@
     </webobject>
     <webobject name = "ShowBottomActionBlock">
       <webobject name = "BottomActionBlock">
+      <webobject name="ShouldShowDefaultPageButtons">
         <webobject name = "ShowCancel">
           <ul class = "ActionList">
             <li><webobject name = "ReturnButton" /></li>
           </ul>
         </webobject>
+      </webobject>
         <webobject name = "SecondaryActionBlock" />
       </webobject>
     </webobject>

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.wod	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODGroupingListPage.wo/ERMODGroupingListPage.wod	2011-01-27 13:41:13 UTC (rev 11920)
@@ -86,3 +86,7 @@
 	elementName = "div";
 	class = d2wContext.classForInnerWrapper;
 }
+
+ShouldShowDefaultPageButtons : WOConditional {
+	condition = d2wContext.shouldShowDefaultPageButtons;
+}

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html	2011-01-27 13:41:13 UTC (rev 11920)
@@ -2,6 +2,7 @@
   <webobject name = "RequiredWrapper">
       <webobject name = "ShowTopActionBlock">
         <webobject name = "TopActionBlock">
+        <webobject name="ShouldShowDefaultPageButtons">
           <ul class = "ActionList">
             <webobject name = "IsEditingConditional">
               <li><webobject name = "CancelButton" /></li>
@@ -16,6 +17,7 @@
               </webobject>
             </webobject>
           </ul>
+        </webobject>
           <webobject name = "SecondaryActionBlock" />
         </webobject>
       </webobject>
@@ -25,6 +27,7 @@
       </webobject><div class="InnerClear"></div>
       <webobject name = "ShowBottomActionBlock">
         <webobject name = "BottomActionBlock">
+        <webobject name="ShouldShowDefaultPageButtons">
           <ul class = "ActionList">
             <webobject name = "IsEditingConditional">
                 <li><webobject name = "CancelButton" /></li>
@@ -39,6 +42,7 @@
               </webobject>
             </webobject>
           </ul>
+         </webobject>
           <webobject name = "SecondaryActionBlock" />
         </webobject>
       </webobject>

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod	2011-01-27 13:41:13 UTC (rev 11920)
@@ -102,4 +102,8 @@
 InnerWrapper : WOGenericContainer {
 	elementName = "div";
 	class = d2wContext.classForInnerWrapper;
+}
+
+ShouldShowDefaultPageButtons : WOConditional {
+	condition = d2wContext.shouldShowDefaultPageButtons;
 }
\ No newline at end of file

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.html	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.html	2011-01-27 13:41:13 UTC (rev 11920)
@@ -2,11 +2,13 @@
   <webobject name = "RequiredWrapper">
     <webobject name = "ShowTopActionBlock">
       <webobject name = "TopActionBlock">
+      <webobject name="ShouldShowDefaultPageButtons">
         <webobject name = "ShowCancel">
           <ul class = "ActionList">
             <li><webobject name = "ReturnButton" /></li>
           </ul>
         </webobject>
+        </webobject>
         <webobject name = "SecondaryActionBlock" />
       </webobject>
     </webobject>
@@ -32,10 +34,12 @@
     </webobject>
     <webobject name = "ShowBottomActionBlock">
       <webobject name = "BottomActionBlock">
+      <webobject name="ShouldShowDefaultPageButtons">
         <webobject name = "ShowCancel">
           <ul class = "ActionList">
             <li><webobject name = "ReturnButton" /></li>
           </ul>
+          </webobject>
         </webobject>
         <webobject name = "SecondaryActionBlock" />
       </webobject>

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.wod	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODListPage.wo/ERMODListPage.wod	2011-01-27 13:41:13 UTC (rev 11920)
@@ -126,3 +126,7 @@
   updateContainerID = d2wContext.idForRepetitionContainer;
   d2wContext = d2wContext;
 }
+
+ShouldShowDefaultPageButtons : WOConditional {
+	condition = d2wContext.shouldShowDefaultPageButtons;
+}

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.html	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.html	2011-01-27 13:41:13 UTC (rev 11920)
@@ -2,6 +2,7 @@
   <webobject name = "RequiredWrapper">
     <webobject name = "ShowTopActionBlock">
       <webobject name = "TopActionBlock">
+      <webobject name = "ShouldShowDefaultPageButtons">
         <ul class = "ActionList">
           <webobject name = "ShowCancel">
             <li><webobject name = "ReturnButton" /></li>
@@ -9,6 +10,7 @@
           <li><webobject name = "ClearButton" /></li>
           <li><webobject name = "QueryButton" /></li>
         </ul>
+        </webobject>
         <webobject name = "ActionBar" />
         <webobject name = "Controller" />
       </webobject>
@@ -16,6 +18,7 @@
     <webobject name = "InnerWrapper"><webobject name = "ErrorBlock"/> <webobject name = "QueryPageRepetition" /> </webobject>
     <webobject name = "ShowBottomActionBlock">
       <webobject name = "BottomActionBlock">
+      <webobject name = "ShouldShowDefaultPageButtons">
         <ul class = "ActionList">
           <webobject name = "ShowCancel">
             <li><webobject name = "ReturnButton" /></li>
@@ -23,6 +26,7 @@
           <li><webobject name = "ClearButton" /></li>
           <li><webobject name = "QueryButton" /></li>
         </ul>
+        </webobject>
         <webobject name = "ActionBar" />
         <webobject name = "Controller" />
       </webobject>

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.wod	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODQueryPage.wo/ERMODQueryPage.wod	2011-01-27 13:41:13 UTC (rev 11920)
@@ -97,3 +97,7 @@
 	elementName = "div";
 	class = d2wContext.classForInnerWrapper;
 }
+
+ShouldShowDefaultPageButtons : WOConditional {
+	condition = d2wContext.shouldShowDefaultPageButtons;
+}

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html	2011-01-27 13:41:13 UTC (rev 11920)
@@ -2,6 +2,7 @@
   <webobject name = "RequiredWrapper">
     <webobject name = "ShowTopActionBlock">
       <webobject name = "TopActionBlock">
+      <webobject name = "ShouldShowDefaultPageButtons">
         <ul class = "ActionList">
           <webobject name = "IsEditingConditional">
             <li><webobject name = "CancelButton" /></li>
@@ -16,6 +17,7 @@
             </webobject>
           </webobject>
         </ul>
+        </webobject>
         <webobject name = "SecondaryActionBlock"/>
       </webobject>
     </webobject>
@@ -27,6 +29,7 @@
     </webobject>
     <webobject name = "ShowBottomActionBlock">
       <webobject name = "BottomActionBlock">
+      <webobject name = "ShouldShowDefaultPageButtons">
         <ul class = "ActionList">
           <webobject name = "IsEditingConditional">
             <li><webobject name = "CancelButton" /></li>
@@ -41,6 +44,7 @@
             </webobject>
           </webobject>
         </ul>
+        </webobject>
         <webobject name = "SecondaryActionBlock"/>
       </webobject>
     </webobject>

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod	2011-01-27 13:39:12 UTC (rev 11919)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod	2011-01-27 13:41:13 UTC (rev 11920)
@@ -129,3 +129,7 @@
   d2wContext = d2wContext;
   object = object;
 }
+
+ShouldShowDefaultPageButtons : WOConditional {
+  condition = d2wContext.shouldShowDefaultPageButtons;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11919
          http://wonder.svn.sourceforge.net/wonder/?rev=11919&view=rev
Author:   davidleber
Date:     2011-01-27 13:39:12 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Added default value for 'shouldShowDefaultPageButtons'

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel	2011-01-27 13:38:27 UTC (rev 11918)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel	2011-01-27 13:39:12 UTC (rev 11919)
@@ -5,6 +5,7 @@
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "displayKeyForEntity"; "value" = "entity.name"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "includeOptionalForm"; "value" = "true"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "propertyTask"; "value" = "editAttribute"; }; }, 
+    {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "shouldShowDefaultPageButtons"; "value" = "true"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControlsWhenEmbedded"; "value" = "false"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartRelationship"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "propertyTask"; "value" = "inspectRelationship"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControls"; "value" = "true"; }; }, 

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt	2011-01-27 13:38:27 UTC (rev 11918)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt	2011-01-27 13:39:12 UTC (rev 11919)
@@ -4,6 +4,7 @@
     0 : *true* => displayKeyForEntity = "entity.name" [com.webobjects.directtoweb.Assignment],
     0 : *true* => includeOptionalForm = "true" [com.webobjects.directtoweb.BooleanAssignment],
     0 : task = 'edit' => propertyTask = "editAttribute" [com.webobjects.directtoweb.Assignment],
+    0 : *true* => shouldShowDefaultPageButtons = "true" [com.webobjects.directtoweb.BooleanAssignment],
     0 : *true* => useAjaxControlsWhenEmbedded = "false" [com.webobjects.directtoweb.BooleanAssignment],
     0 : smartRelationship != null => propertyTask = "inspectRelationship" [com.webobjects.directtoweb.Assignment],
     0 : pageConfiguration like '*Embedded*' => useAjaxControls = "true" [com.webobjects.directtoweb.BooleanAssignment],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11913
          http://wonder.svn.sourceforge.net/wonder/?rev=11913&view=rev
Author:   davidleber
Date:     2011-01-26 15:55:48 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Added support for defaultSortOrdering

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java	2011-01-26 15:00:52 UTC (rev 11912)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java	2011-01-26 15:55:48 UTC (rev 11913)
@@ -13,8 +13,11 @@
 import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.eocontrol.EOEnterpriseObject;
 import com.webobjects.eocontrol.EOQualifier;
+import com.webobjects.eocontrol.EOSortOrdering;
 import com.webobjects.foundation.NSArray;
 import com.webobjects.foundation.NSDictionary;
+import com.webobjects.foundation.NSLog;
+import com.webobjects.foundation.NSMutableArray;
 import com.webobjects.foundation.NSNotification;
 import com.webobjects.foundation.NSNotificationCenter;
 import com.webobjects.foundation.NSSelector;
@@ -24,8 +27,11 @@
 import er.extensions.ERXExtensions;
 import er.extensions.eof.ERXConstant;
 import er.extensions.eof.ERXEC;
+import er.extensions.eof.ERXEOAccessUtilities;
 import er.extensions.eof.ERXEOControlUtilities;
 import er.extensions.eof.ERXGenericRecord;
+import er.extensions.foundation.ERXArrayUtilities;
+import er.extensions.foundation.ERXValueUtilities;
 import er.modern.directtoweb.components.buttons.ERMDActionButton;
 import er.modern.directtoweb.interfaces.ERMEditRelationshipPageInterface;
 
@@ -34,6 +40,8 @@
  * 
  * @d2wKey editConfigurationName
  * @d2wKey isEntityEditable
+ * @d2wKey checkSortOrderingKeys
+ * @d2wKey defaultSortOrdering
  * @d2wKey readOnly
  * @d2wKey relationshipRestrictingQualifier - An additional qualifier that can be used to restrict the objects 
  * 									   		  shown in the relationship (see: ERDDelayedExtraQualifierAssignment).
@@ -52,6 +60,12 @@
 		public static String queryEmbeddedConfigurationName = "queryEmbeddedConfigurationName";
 		public static String localContext = "localContext";
 		public static String relationshipRestrictingQualifier ="relationshipRestrictingQualifier";
+		public static String checkSortOrderingKeys = "checkSortOrderingKeys";
+		public static String defaultSortOrdering = "defaultSortOrdering";
+		public static String userPreferencesSortOrdering	= "sortOrdering";
+		public static String displayPropertyKeys = "displayPropertyKeys";
+		public static String subTask = "subTask";
+		
 	}
 	
 	private EOEnterpriseObject _masterObject;
@@ -296,6 +310,7 @@
 		            relationshipDisplayGroup().setSelectsFirstObjectAfterFetch(true);
 		        
 		        relationshipDisplayGroup().setDataSource(dataSource());
+		        relationshipDisplayGroup().setSortOrderings(sortOrderings());
 		        relationshipDisplayGroup().fetch();
 		        EOQualifier extraQualifier = (EOQualifier)d2wContext().valueForKey(Keys.relationshipRestrictingQualifier);
 		        if (extraQualifier != null) {
@@ -306,6 +321,79 @@
 			}
 		}
 	}
+	
+	// SORT ORDERING
+	
+	@SuppressWarnings("unchecked")
+  public NSArray<EOSortOrdering> sortOrderings() {
+		NSArray<EOSortOrdering> sortOrderings = null;
+		if (userPreferencesCanSpecifySorting()) {
+			sortOrderings = (NSArray<EOSortOrdering>) userPreferencesValueForPageConfigurationKey(Keys.userPreferencesSortOrdering);
+			if (log.isDebugEnabled()) {
+			  log.debug("Found sort Orderings in user prefs " + sortOrderings);
+			}
+		}
+		if (sortOrderings == null) {
+			NSArray<String> sortOrderingDefinition = (NSArray<String>) d2wContext().valueForKey(Keys.defaultSortOrdering);
+			if (sortOrderingDefinition != null) {
+				NSMutableArray<EOSortOrdering> validatedSortOrderings = new NSMutableArray<EOSortOrdering>();
+				NSArray<String> displayPropertyKeys = (NSArray<String>) d2wContext().valueForKey(Keys.displayPropertyKeys);
+				for (int i = 0; i < sortOrderingDefinition.count();) {
+					String sortKey = sortOrderingDefinition.objectAtIndex(i++);
+					String sortSelectorKey = sortOrderingDefinition.objectAtIndex(i++);
+					if (!checkSortOrderingKeys() || isValidSortKey(displayPropertyKeys, sortKey)) {
+					  EOSortOrdering sortOrdering = new EOSortOrdering(sortKey, ERXArrayUtilities.sortSelectorWithKey(sortSelectorKey));
+					  validatedSortOrderings.addObject(sortOrdering);
+					}
+				}
+				sortOrderings = validatedSortOrderings;
+				if (log.isDebugEnabled()) {
+					log.debug("Found sort Orderings in rules " + sortOrderings);
+				}
+			}
+		}
+		return sortOrderings;
+	}
+	
+	/**
+	 * Returns whether or not sort orderings should be validated (based on the checkSortOrderingKeys rule).
+	 * @return whether or not sort orderings should be validated
+	 */
+	public boolean checkSortOrderingKeys() {
+		return ERXValueUtilities.booleanValueWithDefault(d2wContext().valueForKey(Keys.checkSortOrderingKeys), false);
+	}
+	
+	/**
+	 * Validates the given sort key (is it a display key, an attribute, or a valid attribute path). 
+	 * 
+	 * @param displayPropertyKeys the current display properties
+	 * @param sortKey the sort key to validate
+	 * @return true if the sort key is valid, false if not
+	 */
+	protected boolean isValidSortKey(NSArray<String> displayPropertyKeys, String sortKey) {
+	  boolean validSortOrdering = false;
+	  try {
+	    if (displayPropertyKeys.containsObject(sortKey) || entity().anyAttributeNamed(sortKey) != null || ERXEOAccessUtilities.attributePathForKeyPath(entity(), sortKey).count() > 0) {
+	      validSortOrdering = true;
+	    }
+	  }
+	  catch (IllegalArgumentException e) {
+	    // MS: ERXEOAccessUtilities.attributePathForKeyPath throws IllegalArgumentException for a bogus key path
+	    validSortOrdering = false;
+	  }
+	  
+	  if (!validSortOrdering) {
+	    log.warn("Sort key '" + sortKey + "' is not in display keys, attributes or non-flattened key paths for the entity '" + entity().name() + "'.");
+	    validSortOrdering = false;
+	  }
+	  return validSortOrdering;
+  }
+	
+	// this can be overridden by subclasses for which sorting has to be fixed
+	// (i.e. Grouping Lists)
+	public boolean userPreferencesCanSpecifySorting() {
+		return !"printerFriendly".equals(d2wContext().valueForKey(Keys.subTask));
+	}
     
     // ACCESSORS
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11916
          http://wonder.svn.sourceforge.net/wonder/?rev=11916&view=rev
Author:   marroz
Date:     2011-01-26 18:25:41 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Property objects and now read using NSPropertyFileSource.

Modified Paths:
--------------
    branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXProperties.java

Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXProperties.java
===================================================================
--- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXProperties.java	2011-01-26 17:30:50 UTC (rev 11915)
+++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXProperties.java	2011-01-26 18:25:41 UTC (rev 11916)
@@ -25,6 +25,7 @@
 import com.webobjects.foundation.NSSet;
 import com.webobjects.foundation._NSFileUtilities;
 import com.webobjects.foundation.properties.NSPropertiesCoordinator;
+import com.webobjects.foundation.properties.NSPropertyFileSource;
 
 import er.extensions.crypting.ERXCrypto;
 
@@ -501,10 +502,12 @@
         NSProperties.setDictionaryForKey(dictionary, key);
     }
     
+    @Deprecated
     public static NSSet setForKeyWithDefault(String key, NSSet defaultValue) {
         return NSProperties.setForKeyWithDefault(key, defaultValue);
     }
     
+    @Deprecated
     public static NSSet setForKey(String aKey) {
         return NSProperties.setForKey(aKey);
     }
@@ -531,26 +534,28 @@
 	 * @param requireSymlink whether or not to require a symlink (and block) before loading
      * @return properties object with the values from the file
      *      specified.
+     *      
+     * @deprecated USe {@link NSPropertyFileSource#propertiesFromFile(File, boolean)}
      */
+    @Deprecated
     public static Properties propertiesFromPath(String path, boolean requireSymlink) {
-    	ERXProperties.NestedProperties prop = new ERXProperties.NestedProperties();
-
-        if (path == null  ||  path.length() == 0) {
+    	if (path == null  ||  path.length() == 0) {
             log.warn("Attempting to read property file for null file path");
-            return prop;
+            return new Properties();
         }
 
         File file = new File(path);
         try {
-        	prop.load(file, requireSymlink);
+            Properties properties = NSPropertyFileSource.propertiesFromFile(file, requireSymlink);
             log.debug("Loaded configuration file at path: "+ path);
-        } catch (IOException e) {
-        	if (ERXProperties.shouldValidateProperties()) {
+            return properties;
+        } catch (Exception e) {
+        	if (NSProperties.booleanForKey("NSValidateProperties")) {
         		throw new RuntimeException("File '" + path + "' could not be read.", e);
         	}
             log.error("Unable to initialize properties from file \"" + path + "\"", e);
         }
-        return prop;
+        return new Properties();
     }
 
     /**
@@ -573,145 +578,6 @@
         return NSPropertiesCoordinator.sharedInstance().valueForKey(aKey);
     }
 	
-	/**
-	 * NestedProperties is a subclass of Properties that provides support for including other
-	 * Properties files on the fly.  If you create a property named .includeProps, the value
-	 * will be interpreted as a file to load.  If the path is absolute, it will just load it
-	 * directly.  If it's relative, the path will be loaded relative to the current user's
-	 * home directory.  Multiple .includeProps can be included in a Properties file and they
-	 * will be loaded in the order they appear within the file.
-	 *  
-	 * @author mschrag
-	 */
-	// @WOHack(why="This is a copy of NSProperties.NestedProperties, but Wonder doesn't build against the custom WO 5.2.3.")
-	public static class NestedProperties extends Properties {
-		public static final String IncludePropsSoFarKey = ".includePropsSoFar";
-		public static final String IncludePropsKey = ".includeProps";
-		
-		private Stack<File> _files = new Stack<File>();
-		
-		public NestedProperties() {
-		}
-
-		public NestedProperties(Properties defaults) {
-			super(defaults);
-		}
-		
-		@Override
-		public synchronized Object put(Object key, Object value) {
-			if (NestedProperties.IncludePropsKey.equals(key)) {
-				String propsFileName = (String)value;
-                File propsFile = new File(propsFileName);
-                if (!propsFile.isAbsolute()) {
-                    // if we don't have any context for a relative (non-absolute) props file,
-                    // we presume that it's relative to the user's home directory
-    				File cwd = null;
-    				if (_files.size() > 0) {
-    					cwd = _files.peek();
-    				}
-    				else {
-    					cwd = new File(System.getProperty("user.home"));
-                	}
-                    propsFile = new File(cwd, propsFileName);
-                }
-                // MS: Canonicalize the includeProps path so that we get more reliable duplicate checks. Otherwise, depending on 
-                // exactly how the include path was constructed (with .., absolute path, etc) you might get the same props
-                // file included twice but with two different names. It would likely get caught and explode later on, anyway,
-                // but failing fast is always desirable.
-                String propsPath;
-                try {
-                	propsPath = propsFile.getCanonicalPath();
-                }
-                catch (IOException e) {
-					throw new RuntimeException("Failed to canonicalize the property file '" + propsFile + "'.", e);
-                }
-
-                // Detect mutually recursing props files by tracking what we've already loaded:
-                String existingIncludeProps = this.getProperty(NestedProperties.IncludePropsSoFarKey);
-                if (existingIncludeProps == null) {
-                	existingIncludeProps = "";
-                }
-                if (existingIncludeProps.indexOf(propsPath) > -1) {
-                	log.info("ERXProperties.NestedProperties.load(): Possible recursive includeProps detected. '" + propsPath + "' was included in more than one of the following files: " + existingIncludeProps);
-                	log.info("ERXProperties.NestedProperties.load() cannot proceed - QUITTING!");
-                    System.exit(1);
-                }
-                if (existingIncludeProps.length() > 0) {
-                	existingIncludeProps += ", ";
-                }
-                existingIncludeProps += propsPath;
-                super.put(NestedProperties.IncludePropsSoFarKey, existingIncludeProps);
-
-                try {
-                    log.info("ERXProperties.NestedProperties.load(): Including props file: " + propsFile);
-					this.load(propsFile, ERXProperties._shouldRequireSymlinkedGlobalAndIncludeProperties());
-				} catch (IOException e) {
-					throw new RuntimeException("Failed to load the property file '" + value + "'.", e);
-				}
-				return null;
-			}
-			else {
-				return super.put(key, value);
-			}
-		}
-
-		/**
-		 * Loads the properties from the given file, optionally blocking until the symlink is resolved.
-		 * 
-		 * @param propsFile the properties file to load from
-		 * @param requireSymlink whether or not to require a symlink (and block) before loading
-		 * @throws IOException if properties loading fails
-		 */
-		public synchronized void load(File propsFile, boolean requireSymlink) throws IOException {
-			// MS: We pull the canonical path here in case you symlink to a Properties file
-			// that has relative .includeProps paths in it (that you expect to load from the same
-			// folder as the symlink target). It's debatable whether this is actually the desired 
-			// behavior all the time, but until I hear someone who needs the old way, I'm not
-			// going to increase the complexity by adding a config flag that has to propagate all over.
-			File canonicalPropsFile;
-			if (requireSymlink) {
-            	canonicalPropsFile = _NSFileUtilities.resolveLink(propsFile.getPath(), propsFile.getName());
-			}
-			else {
-				canonicalPropsFile = propsFile.getCanonicalFile();
-			}
-
-	        if (!canonicalPropsFile.exists() || !canonicalPropsFile.isFile() || !canonicalPropsFile.canRead()) {
-	            if (ERXProperties.shouldValidateProperties()) {
-	                throw new RuntimeException("File " + propsFile.getPath() + " (resolved to " + canonicalPropsFile.getPath() + ") doesn't exist or can't be read.");
-	            }
-	            log.warn("File " + propsFile.getPath() + " doesn't exist or can't be read.");
-	            return;
-	        }
-
-			_files.push(canonicalPropsFile.getParentFile());
-			try {
-	            BufferedInputStream is = new BufferedInputStream(new FileInputStream(canonicalPropsFile));
-	            try {
-	            	load(is);
-	            }
-	            finally {
-	            	is.close();
-	            }
-			}
-			finally {
-				_files.pop();
-			}
-		}
-	}
-
-	// MS: NSValidateProperties specifies whether we should more strictly validate properties files and kill startup if there is a failure. Setting
-	// this property to false will switch everything back to the previous behavior.
-	private static boolean shouldValidateProperties() {
-		return Boolean.valueOf(System.getProperty("NSValidateProperties", "true"));
-	}
-
-	// MS: NSRequireSymlinkedGlobalAndIncludeProperties specifies whether we should require root and included properties files to be symlinked. This does not include
-	// the root Properties files loaded from frameworks.
-	private static boolean _shouldRequireSymlinkedGlobalAndIncludeProperties() {
-		return Boolean.valueOf(System.getProperty("NSRequireSymlinkedGlobalAndIncludeProperties", "false"));
-	}
-	
 	public static void registerForInstanceOperator() {
 	    NSPropertiesCoordinator.registerProcessorClass(ERXInstanceRangeProcessor.class);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11917
          http://wonder.svn.sourceforge.net/wonder/?rev=11917&view=rev
Author:   tcripps
Date:     2011-01-26 19:37:10 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Fixed a misplaced </webobject> tag that was causing extra cells in the attribute repetition.

Modified Paths:
--------------
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2011-01-26 18:25:41 UTC (rev 11916)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/Core/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2011-01-26 19:37:10 UTC (rev 11917)
@@ -124,6 +124,7 @@
 					</webobject>
 				</webobject>
 				</webobject>
+				</webobject>
 				<webobject name="IfNotHasDeleteWidgetPropertyKey">
 				<td>
 					<webobject name="IsListing">
@@ -133,7 +134,6 @@
 					</webobject>
 				</td>
 				</webobject>
-				</webobject>
 			</webobject>
 			<tr>
 				<td bgcolor="#ffffff" colspan='<webobject name="ColSpanNumber"></webobject>'><img border="0" height="2" width="1" /></td>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11915
          http://wonder.svn.sourceforge.net/wonder/?rev=11915&view=rev
Author:   davidleber
Date:     2011-01-26 17:30:50 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Emebedded list pages do not support inline editing

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt	2011-01-26 17:30:35 UTC (rev 11914)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt	2011-01-26 17:30:50 UTC (rev 11915)
@@ -46,6 +46,8 @@
     10 : (task = 'list' or task = 'select' or (task = 'edit' and subTask = 'list')) => repetitionComponentName = "ERMDSimpleListPageRepetition" [com.webobjects.directtoweb.Assignment],
     10 : *true* => editRelationshipEmbeddedConfigurationName = "<ERMDDefaultConfigurationNameAssignment>" [er.modern.directtoweb.assignments.defaults.ERMDDefaultConfigurationNameAssignment],
     10 : (task = 'list' or task = 'select' or task = 'editRelationship') => displayPropertyKeys = "defaultPropertyKeysFromEntityWithoutRelationships" [com.webobjects.directtoweb.DefaultAssignment],
+    15 : (task = 'list' and parentPageConfiguration != null) => useAjaxControls = "false" [com.webobjects.directtoweb.BooleanAssignment],
+    15 : (task = 'list' and parentPageConfiguration != null) => allowInlineEditing = "false" [com.webobjects.directtoweb.BooleanAssignment],
     15 : (task = 'edit' or task = 'inspect' or task = 'select') => shouldShowCancelButton = "true" [com.webobjects.directtoweb.BooleanAssignment],
     20 : task != 'edit' => hasForm = "false" [com.webobjects.directtoweb.BooleanAssignment],
     20 : *true* => datePickerHideControl = "true" [com.webobjects.directtoweb.BooleanAssignment],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11914
          http://wonder.svn.sourceforge.net/wonder/?rev=11914&view=rev
Author:   davidleber
Date:     2011-01-26 17:30:35 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Emebedded list pages do not support inline editing

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel

Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel	2011-01-26 15:55:48 UTC (rev 11913)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel	2011-01-26 17:30:35 UTC (rev 11914)
@@ -47,6 +47,8 @@
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "select"; }, {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "list"; }); }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "repetitionComponentName"; "value" = "ERMDSimpleListPageRepetition"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.modern.directtoweb.assignments.defaults.ERMDDefaultConfigurationNameAssignment"; "keyPath" = "editRelationshipEmbeddedConfigurationName"; "value" = "<ERMDDefaultConfigurationNameAssignment>"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "select"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "editRelationship"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.DefaultAssignment"; "keyPath" = "displayPropertyKeys"; "value" = "defaultPropertyKeysFromEntityWithoutRelationships"; }; }, 
+    {"author" = "15"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "parentPageConfiguration"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControls"; "value" = "false"; }; }, 
+    {"author" = "15"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "parentPageConfiguration"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "allowInlineEditing"; "value" = "false"; }; }, 
     {"author" = "15"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "inspect"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "select"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "shouldShowCancelButton"; "value" = "true"; }; }, 
     {"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "RuleIsDisabled"; "selectorName" = "isEqual"; "value" = "YES"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isNotEqualTo"; "value" = "edit"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "hasForm"; "value" = "false"; }; }, 
     {"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "datePickerHideControl"; "value" = "true"; }; }, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.