You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2004/11/12 19:18:35 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/platforms PlatformHsqldbImpl.java
brj 2004/11/12 10:18:35
Modified: src/test/org/apache/ojb/broker/sequence
NativeIdentifierTest.java
src/java/org/apache/ojb/broker/platforms
PlatformHsqldbImpl.java
Log:
resolve issues with hsqldb 1.7.2 (by michael hart)
Revision Changes Path
1.16 +3 -3 db-ojb/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
Index: NativeIdentifierTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NativeIdentifierTest.java 14 Sep 2004 16:43:49 -0000 1.15
+++ NativeIdentifierTest.java 12 Nov 2004 18:18:35 -0000 1.16
@@ -47,7 +47,7 @@
" auto_increment,REF_ID int(11),NAME VARCHAR(250))";
private static final String CREATE_HSQL =
"CREATE TABLE NATIVE_MAIN_OBJECT(NATIVE_ID IDENTITY NOT NULL PRIMARY KEY," +
- " REF_ID int(11),NAME VARCHAR(250))";
+ " REF_ID int,NAME VARCHAR(250))";
private static final String INSERT_DUMMY = "INSERT INTO NATIVE_MAIN_OBJECT (NAME) VALUES ('Dummy_1')";
@@ -70,7 +70,7 @@
" , FOREIGN KEY (FK_ID) REFERENCES NATIVE_MAIN_OBJECT (NATIVE_ID) )";
private static final String CREATE_REF_HSQL =
"CREATE TABLE NATIVE_REFERENCE_OBJECT (NATIVE_ID IDENTITY NOT NULL PRIMARY KEY," +
- " NAME VARCHAR(250), FK_ID int(11), REF_ID int(11), SINGLE_REF_FK BIGINT" +
+ " NAME VARCHAR(250), FK_ID int, REF_ID int, SINGLE_REF_FK BIGINT" +
" , FOREIGN KEY (FK_ID) REFERENCES NATIVE_MAIN_OBJECT (NATIVE_ID) )";
private static final String DROP_REF = "DROP TABLE NATIVE_REFERENCE_OBJECT";
private static final String INSERT_DUMMY_REF = "INSERT INTO NATIVE_REFERENCE_OBJECT (NAME) VALUES ('Dummy_2')";
1.8 +31 -7 db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformHsqldbImpl.java
Index: PlatformHsqldbImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformHsqldbImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PlatformHsqldbImpl.java 4 Apr 2004 23:53:35 -0000 1.7
+++ PlatformHsqldbImpl.java 12 Nov 2004 18:18:35 -0000 1.8
@@ -1,6 +1,5 @@
package org.apache.ojb.broker.platforms;
-
/* Copyright 2002-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,6 @@
* limitations under the License.
*/
-
/**
* This class extends <code>PlatformDefaultImpl</code> and defines specific
* behavior for the Hsqldb platform.
@@ -36,12 +34,15 @@
return SQL92_NOPAREN_JOIN_SYNTAX;
}
+ /**
+ * @see org.apache.ojb.broker.platforms.Platform#getLastInsertIdentityQuery(java.lang.String)
+ */
public String getLastInsertIdentityQuery(String tableName)
{
return LAST_INSERT;
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.ojb.broker.platforms.Platform#addPagingSql(java.lang.StringBuffer)
*/
public void addPagingSql(StringBuffer anSqlString)
@@ -49,7 +50,7 @@
anSqlString.insert(6, " LIMIT ? ? ");
}
- /* (non-Javadoc)
+ /**
* @see org.apache.ojb.broker.platforms.Platform#bindPagingParametersFirst()
*/
public boolean bindPagingParametersFirst()
@@ -57,7 +58,7 @@
return true;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.ojb.broker.platforms.Platform#supportsPaging()
*/
public boolean supportsPaging()
@@ -65,5 +66,28 @@
return true;
}
+ /**
+ * @see org.apache.ojb.broker.platforms.Platform#createSequenceQuery(java.lang.String)
+ */
+ public String createSequenceQuery(String sequenceName)
+ {
+ return "CREATE SEQUENCE " + sequenceName;
+ }
+
+ /**
+ * @see org.apache.ojb.broker.platforms.Platform#nextSequenceQuery(java.lang.String)
+ */
+ public String nextSequenceQuery(String sequenceName)
+ {
+ return "CALL NEXT VALUE FOR " + sequenceName;
+ }
+
+ /**
+ * @see org.apache.ojb.broker.platforms.Platform#dropSequenceQuery(java.lang.String)
+ */
+ public String dropSequenceQuery(String sequenceName)
+ {
+ return "DROP SEQUENCE " + sequenceName;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org