Author: aaime
Date: 2009-11-11 12:10:04 -0500 (Wed, 11 Nov 2009)
New Revision: 34361
Modified:
trunk/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleDialect.java
trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties
trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/ds.properties
trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties
Log:
GEOT-2830, Oracle dialect should look for sequences in ALL_SEQUENCES
Modified: trunk/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleDialect.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleDialect.java 2009-11-11 14:27:11 UTC (rev 34360)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleDialect.java 2009-11-11 17:10:04 UTC (rev 34361)
@@ -702,18 +702,32 @@
String sequenceName = (tableName + "_" + columnName + "_SEQUENCE").toUpperCase();
Statement st = cx.createStatement();
try {
+ // check the user owned sequences
ResultSet rs = st.executeQuery( "SELECT * FROM USER_SEQUENCES" +
" WHERE SEQUENCE_NAME = '" + sequenceName + "'");
try {
if ( rs.next() ) {
return sequenceName;
}
+ } finally {
+ dataStore.closeSafe( rs );
}
- finally {
+ dataStore.closeSafe( rs );
+
+ // that did not work, let's see if the sequence is available in someone else schema
+ rs = st.executeQuery( "SELECT * FROM ALL_SEQUENCES" +
+ " WHERE SEQUENCE_NAME = '" + sequenceName + "'");
+ try {
+ if ( rs.next() ) {
+ String schema = rs.getString("OWNER");
+ return schema + "." + sequenceName;
+ }
+ } finally {
dataStore.closeSafe( rs );
}
- }
- finally {
+
+
+ } finally {
dataStore.closeSafe( st );
}
Modified: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties 2009-11-11 14:27:11 UTC (rev 34360)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties 2009-11-11 17:10:04 UTC (rev 34361)
@@ -1,4 +1,4 @@
driver=oracle.jdbc.driver.OracleDriver
-url=jdbc:oracle:thin:@192.168.1.200:1521:xe
-username=spatial
+url=jdbc:oracle:thin:@localhost:1521:xe
+username=geoserver
password=postgis
Modified: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/ds.properties
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/ds.properties 2009-11-11 14:27:11 UTC (rev 34360)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/ds.properties 2009-11-11 17:10:04 UTC (rev 34361)
@@ -1,5 +1,5 @@
type=javax.sql.DataSource
driver=oracle.jdbc.driver.OracleDriver
url=jdbc:oracle:thin:@localhost:1521:xe
-user=spatial
+user=geoserver
password=postgis
Modified: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties 2009-11-11 14:27:11 UTC (rev 34360)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties 2009-11-11 17:10:04 UTC (rev 34361)
@@ -1,5 +1,5 @@
driver=oracle.jdbc.driver.OracleDriver
-host=192.168.1.200
+host=localhost
port=1521
database=xe
user=geoserver
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.
http://p.sf.net/sfu/bobj-july_______________________________________________
GeoTools-commits mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-commits
