Hi Daniel:
I do the diff again. I hope this time it can be acceptable. If anyone check in my
change, would you please send a email to me.
Regards
fanyun
------------------------------------------------------------------------------
? sql/ExecuteOdbcTurbineSchema.java
? sql/Odbc_id_table.sql
? sql/Odbc_users_roles_permissions.sql
? sql/Turbine-AccessY2K.mdb
Index: java/org/apache/turbine/om/peer/BasePeer.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/om/peer/BasePeer.java,v
retrieving revision 1.4
diff -u -r1.4 BasePeer.java
--- java/org/apache/turbine/om/peer/BasePeer.java 2000/08/17 05:06:23 1.4
+++ java/org/apache/turbine/om/peer/BasePeer.java 2000/08/23 09:47:11
@@ -77,8 +77,7 @@
* Peer classes are responsible for isolating all of the database
* access for a specific business object. They execute all of the SQL
* against the database. Over time this class has grown to include
- * utility methods which ease execution of cross-database database queries
- * and the implementation of concrete Peers.
+ * utility methods which
*
* @author Frank Y. Kim
* @author John D. McNally
@@ -708,7 +707,16 @@
{
String columnName = select.get(i);
selectClause.add(columnName);
- fromClause.add(columnName.substring(0,columnName.indexOf('.') ));
+
+ int braceplace = columnName.indexOf('(');
+ if(braceplace == -1)
+ {
+ fromClause.add(columnName.substring(0,columnName.indexOf('.') ));
+ }
+ else
+ {
+
+fromClause.add(columnName.substring(braceplace+1,columnName.indexOf('.') ));
+ }
}
Enumeration e = criteria.keys();
----- Original Message -----
From: "Daniel L. Rall" <[EMAIL PROTECTED]>
To: "Turbine" <[EMAIL PROTECTED]>
Sent: Wednesday, August 23, 2000 12:30 AM
Subject: Re: Change to BasePeer
> fanyun wrote:
> > [snip]
> > ? patchfile.diff.gz
> > ? patchfile.diff.gz1
> > ? sql/ExecuteOdbcTurbineSchema.java
> > ? sql/Odbc_id_table.sql
> > ? sql/Odbc_users_roles_permissions.sql
> > ? sql/Turbine-AccessY2K.mdb
> > Index: java/org/apache/turbine/om/peer/BasePeer.java
> > ===================================================================
> > RCS file:
>/products/cvs/turbine/turbine/src/java/org/apache/turbine/om/peer/BasePeer.java,v
> > retrieving revision 1.4
> > diff -u -r1.4 BasePeer.java
> > --- java/org/apache/turbine/om/peer/BasePeer.java 2000/08/17 05:06:23 1.4
> > +++ java/org/apache/turbine/om/peer/BasePeer.java 2000/08/18 12:56:47
> > @@ -77,8 +77,7 @@
> > * Peer classes are responsible for isolating all of the database
> > * access for a specific business object. They execute all of the SQL
> > * against the database. Over time this class has grown to include
> > - * utility methods which ease execution of cross-database database queries
> > - * and the implementation of concrete Peers.
> > + * utility methods which
> > *
> > * @author Frank Y. Kim
> > * @author John D. McNally
> > @@ -708,7 +707,16 @@
> > {
> > String columnName = select.get(i);
> > selectClause.add(columnName);
> > - fromClause.add(columnName.substring(0,columnName.indexOf('.') ));
> > +
> > + int braceplace = columnName.indexOf('(');
> > + if(braceplace == -1)
> > + {
> > + fromClause.add(columnName.substring(0,columnName.indexOf('.') ));
> > + }
> > + else
> > + {
> > +
>fromClause.add(columnName.substring(braceplace+1,columnName.indexOf('.') ));
> > + }
> > }
> >
> > Enumeration e = criteria.keys();
>
> That looks a lot more like it Fanyun. Please note that the header
> comment on this file is out of date--you have an old version Fanyun. I
> noticed that the last sentence was just a fragment in CVS for some
> reason, and corrected this.
> --
>
> Daniel Rall <[EMAIL PROTECTED]>
>
>
> ------------------------------------------------------------
> To subscribe: [EMAIL PROTECTED]
> To unsubscribe: [EMAIL PROTECTED]
> Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
> Problems?: [EMAIL PROTECTED]
>
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]