Menu
▾
▴
Re: [Wonder-cvs] SF.net SVN: wonder:[11930] branches/Wonder_5_0_0_WebObjects_5_4_Branch/ Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper .java
|
From: Ramsey G. <ram...@gm...> - 2011-01-29 14:38:06
|
(^_^;)> Sorry Mike. I can commit them next time. I've seen you and Chuck frustratedly trying to get the ibox mergeinfo stuff to go away, so I didn't want to commit them and screw things up again. I get them every time I run the MergeFromTrunk.sh. If you'd like, I can run the script again and commit the mergeinfos produced. Ramsey On Jan 29, 2011, at 9:28 AM, Mike Schrag wrote: > Ah ok ... those empty updates are the svn:mergeinfo properties (the column of the U/A/M/D characters show whether it's a file or a property update) ... That explains it, then. So what's happening is that you're committing the code change, but not the metadata that's tracking the svn merge, so svn doesn't actually KNOW it's a merge. > > ms > > On Jan 29, 2011, at 9:24 AM, Ramsey Gurley wrote: > >> Hi Mike, >> >> Ok, sorry. Tell me what I'm doing wrong so I don't do it again. I did the following: >> >> cd ~Workspace/Wonder/Wonder/ >> sh MergeFromTrunk.sh >> >> Then in subclipse, I committed the change to the ERXSQLHelper. >> >> Should I be doing that part from the command line too? I did notice quite a few 'empty' updates to stuff in ibox and ERXTest which I reverted in subclipse. >> >> Ramsey >> >> >> On Jan 29, 2011, at 9:15 AM, Mike Schrag wrote: >> >>> you should do these with the MergeFromTrunk script in the root directory of Wonder on the 5.4 branch, which actually uses "svn merge" ... otherwise later svn merge's get conflicts because there are conflicting changes in both branches. >>> >>> ms >>> >>> On Jan 29, 2011, at 9:12 AM, nul...@us... wrote: >>> >>>> 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. >>>> >>>> ------------------------------------------------------------------------------ >>>> Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! >>>> Finally, a world-class log management solution at an even better price-free! >>>> Download using promo code Free_Logger_4_Dev2Dev. Offer expires >>>> February 28th, so secure your free ArcSight Logger TODAY! >>>> http://p.sf.net/sfu/arcsight-sfd2d >>>> _______________________________________________ >>>> Wonder-cvs mailing list >>>> Won...@li... >>>> https://lists.sourceforge.net/lists/listinfo/wonder-cvs >>> >> > |