cvs commit: db-torque/src/rttest/org/apache/torque DataTest.java

[tfischer]

tfischer2005/02/18 01:26:03

  Modified:src/rttest/org/apache/torque DataTest.java
  Log:
  corrected error message
  
  Revision  ChangesPath
  1.11  +2 -2  db-torque/src/rttest/org/apache/torque/DataTest.java
  
  Index: DataTest.java
  ===
  RCS file: /home/cvs/db-torque/src/rttest/org/apache/torque/DataTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DataTest.java 31 Jan 2005 19:43:58 -  1.10
  +++ DataTest.java 18 Feb 2005 09:26:03 -  1.11
  @@ -117,7 +117,7 @@
   catch (Exception ex)
   {
   ex.printStackTrace();
  -fail(cleaning table : Exception caught :  
  +fail(Exception caught :  
   + ex.getClass().getName() 
   +  :  + ex.getMessage());
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: db-torque/src/java/org/apache/torque/util SQLBuilder.java Criteria.java

[tfischer]

tfischer2005/02/18 02:04:38

  Modified:src/java/org/apache/torque/util SQLBuilder.java
Criteria.java
  Log:
  allow dots in autogenerated table names
  This is a first step towards support of fully qualified table names (table 
name=schema_name.table_name ... ) in the generator.
  I did not notice any further problems with such table names in the runtime.
  The generator still produces invalid java names, but this can be overridden 
via the javaName attribute of the table tag.
  
  Revision  ChangesPath
  1.3   +6 -9  db-torque/src/java/org/apache/torque/util/SQLBuilder.java
  
  Index: SQLBuilder.java
  ===
  RCS file: 
/home/cvs/db-torque/src/java/org/apache/torque/util/SQLBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SQLBuilder.java   31 Jan 2005 19:43:52 -  1.2
  +++ SQLBuilder.java   18 Feb 2005 10:04:37 -  1.3
  @@ -470,17 +470,16 @@
   for (int i = 0; i  orderBy.size(); i++)
   {
   String orderByColumn = (String) orderBy.get(i);
  -if (orderByColumn.indexOf('.') == -1)
  +int dotPos = orderByColumn.lastIndexOf('.');
  +if (dotPos == -1)
   {
   throwMalformedColumnNameException(
   order by,
   orderByColumn);
   }
   
  -//String table =
  -//orderByColumn.substring(0, 
orderByColumn.lastIndexOf('.'));
   String tableName =
  -orderByColumn.substring(0, 
orderByColumn.indexOf('.'));
  +orderByColumn.substring(0, dotPos);
   String table = crit.getTableForAlias(tableName);
   if (table == null)
   {
  @@ -494,13 +493,11 @@
   if (spacePos == -1)
   {
   columnName =
  -
orderByColumn.substring(orderByColumn.indexOf('.') + 1);
  +orderByColumn.substring(dotPos + 1);
   }
   else
   {
  -columnName = orderByColumn.substring(
  -orderByColumn.indexOf('.') + 1,
  -spacePos);
  +columnName = orderByColumn.substring(dotPos + 1, 
spacePos);
   }
   ColumnMap column = 
dbMap.getTable(table).getColumn(columnName);
   if (column.getType() instanceof String)
  
  
  
  1.46  +2 -2  db-torque/src/java/org/apache/torque/util/Criteria.java
  
  Index: Criteria.java
  ===
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/Criteria.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Criteria.java 31 Jan 2005 19:43:52 -  1.45
  +++ Criteria.java 18 Feb 2005 10:04:37 -  1.46
  @@ -3070,7 +3070,7 @@
   Criterion(String tableColumn, Object val, SqlEnum comp)
   {
   this(val, comp);
  -int dot = tableColumn.indexOf('.');
  +int dot = tableColumn.lastIndexOf('.');
   if (dot == -1)
   {
   table = ;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: db-torque/xdocs changes.xml

[tfischer]

tfischer2005/02/18 02:06:22

  Modified:xdocschanges.xml
  Log:
  oops, forgot to mention a change I did some time ago...
  
  Revision  ChangesPath
  1.144 +5 -0  db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- changes.xml   31 Jan 2005 19:43:56 -  1.143
  +++ changes.xml   18 Feb 2005 10:06:22 -  1.144
  @@ -28,6 +28,11 @@
 body
   
 release version=3.2-dev date=in CVS
  +action type=remove dev=tfischer issue=TRQS222
  +  Removed Oracle Update patch again. 
  +  Creates invalid scripts and causes ant to fail. 
  +  See Scarab for further details
  +/action
   action dev='mpoeschl' type='remove'
 Remove support for old properties (properties without 'torque.' prefix)
   /action
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]