henning 2003/10/17 05:18:40
Modified: proposals/henning/column-javaname Tag: TORQUE_3_1_BRANCH
column-javaname.patch
Log:
make it patchable with -p1
Revision Changes Path
No revision
No revision
1.1.2.2 +11 -11
db-torque/proposals/henning/column-javaname/Attic/column-javaname.patch
Index: column-javaname.patch
===================================================================
RCS file:
/home/cvs/db-torque/proposals/henning/column-javaname/Attic/column-javaname.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- column-javaname.patch 17 Oct 2003 12:06:20 -0000 1.1.2.1
+++ column-javaname.patch 17 Oct 2003 12:18:40 -0000 1.1.2.2
@@ -1,6 +1,6 @@
diff -u -b -r1.3 MapBuilder.vm
---- src/generator/src/templates/om/MapBuilder.vm 7 Aug 2003 13:13:00 -0000
1.3
-+++ src/generator/src/templates/om/MapBuilder.vm 17 Oct 2003 12:03:34 -0000
+--- db-torque/src/generator/src/templates/om/MapBuilder.vm 7 Aug 2003 13:13:00
-0000 1.3
++++ db-torque/src/generator/src/templates/om/MapBuilder.vm 17 Oct 2003 12:03:34
-0000
@@ -122,18 +122,18 @@
#if($col.isPrimaryKey())
#if($col.isForeignKey())
@@ -24,13 +24,13 @@
#end
#end
#end
-Index: src/java/org/apache/torque/TorqueInstance.java
+Index: db-torque/src/java/org/apache/torque/TorqueInstance.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.5
diff -u -b -r1.5 TorqueInstance.java
---- src/java/org/apache/torque/TorqueInstance.java 5 Aug 2003 18:09:35 -0000
1.5
-+++ src/java/org/apache/torque/TorqueInstance.java 17 Oct 2003 12:03:34 -0000
+--- db-torque/src/java/org/apache/torque/TorqueInstance.java 5 Aug 2003 18:09:35
-0000 1.5
++++ db-torque/src/java/org/apache/torque/TorqueInstance.java 17 Oct 2003 12:03:34
-0000
@@ -706,10 +706,10 @@
{
map.setIdTable("ID_TABLE");
@@ -46,13 +46,13 @@
}
/**
-Index: src/java/org/apache/torque/map/ColumnMap.java
+Index: db-torque/src/java/org/apache/torque/map/ColumnMap.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/map/ColumnMap.java,v
retrieving revision 1.7
diff -u -b -r1.7 ColumnMap.java
---- src/java/org/apache/torque/map/ColumnMap.java 21 Mar 2003 17:31:08 -0000
1.7
-+++ src/java/org/apache/torque/map/ColumnMap.java 17 Oct 2003 12:03:34 -0000
+--- db-torque/src/java/org/apache/torque/map/ColumnMap.java 21 Mar 2003 17:31:08
-0000 1.7
++++ db-torque/src/java/org/apache/torque/map/ColumnMap.java 17 Oct 2003 12:03:34
-0000
@@ -86,6 +86,9 @@
/** The name of the column. */
private String columnName;
@@ -90,13 +90,13 @@
}
/**
-Index: src/java/org/apache/torque/map/TableMap.java
+Index: db-torque/src/java/org/apache/torque/map/TableMap.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/map/TableMap.java,v
retrieving revision 1.13
diff -u -b -r1.13 TableMap.java
---- src/java/org/apache/torque/map/TableMap.java 23 Aug 2003 13:18:54 -0000
1.13
-+++ src/java/org/apache/torque/map/TableMap.java 17 Oct 2003 12:03:34 -0000
+--- db-torque/src/java/org/apache/torque/map/TableMap.java 23 Aug 2003 13:18:54
-0000 1.13
++++ db-torque/src/java/org/apache/torque/map/TableMap.java 17 Oct 2003 12:03:34
-0000
@@ -321,120 +321,143 @@
* Add a column to this table of a certain type.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]