jvanzyl 01/05/11 06:41:43
Modified: src/java/org/apache/turbine/torque/engine/database/transform
SQLToAppData.java
Log:
- applying jeff's patches to fix the build.
Revision Changes Path
1.5 +1 -54
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java
Index: SQLToAppData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SQLToAppData.java 2001/05/05 13:19:16 1.4
+++ SQLToAppData.java 2001/05/11 13:41:42 1.5
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: SQLToAppData.java,v 1.4 2001/05/05 13:19:16 jvanzyl Exp $
+ * @version $Id: SQLToAppData.java,v 1.5 2001/05/11 13:41:42 jvanzyl Exp $
*/
public class SQLToAppData
{
@@ -339,60 +339,7 @@
err (") expected");
next();
}
-
- while (token.getStr().toUpperCase().equals("ON"))
- {
- next();
-
- if (token.getStr().toUpperCase().equals("DELETE"))
- {
- fk.setOnDelete (Foreign_On_xxx());
- }
- else if (token.getStr().toUpperCase().equals("UPDATE"))
- {
- fk.setOnUpdate (Foreign_On_xxx());
- }
- else
- {
- err ("DELETE or UPDATE expected "+token.getStr()+" found.");
- }
- }
}
-
- /**
- * Parse ON DELETE <XXX> and ON UPDATE <XXX> in foreign keys.
- */
- private int Foreign_On_xxx() throws ParseException
- {
- int result = ForeignKey.NONE;
-
- next();
-
- if (token.getStr().toUpperCase().equals("CASCADE"))
- {
- result = ForeignKey.CASCADE;
- }
- else if (token.getStr().toUpperCase().equals("RESTRICT"))
- {
- result = ForeignKey.RESTRICT;
- }
- else if (token.getStr().toUpperCase().equals("SET"))
- {
- next();
- if (!token.getStr().toUpperCase().equals("NULL"))
- err ("NULL expected");
- result = ForeignKey.SET_NULL;
- }
- else
- {
- err ("CASCADE or RESTRUCT or SET NULL expected");
- }
-
- next();
-
- return result;
- }
-
/**
* Parse the data definition of the column statement.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
