Revision: 4820
http://sourceforge.net/p/jump-pilot/code/4820
Author: michaudm
Date: 2016-02-07 10:15:46 +0000 (Sun, 07 Feb 2016)
Log Message:
-----------
small cleanings
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/datastore/postgis/PostgisFeatureInputStream.java
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/SpatialDatabasesDSMetadata.java
Modified:
core/trunk/src/com/vividsolutions/jump/datastore/postgis/PostgisFeatureInputStream.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/datastore/postgis/PostgisFeatureInputStream.java
2016-02-06 11:26:43 UTC (rev 4819)
+++
core/trunk/src/com/vividsolutions/jump/datastore/postgis/PostgisFeatureInputStream.java
2016-02-07 10:15:46 UTC (rev 4820)
@@ -2,12 +2,8 @@
import
com.vividsolutions.jump.datastore.spatialdatabases.SpatialDatabasesFeatureInputStream;
import
com.vividsolutions.jump.datastore.spatialdatabases.SpatialDatabasesResultSetConverter;
-import com.vividsolutions.jump.workbench.JUMPWorkbench;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
*
@@ -15,7 +11,7 @@
*/
public class PostgisFeatureInputStream extends
SpatialDatabasesFeatureInputStream {
- public PostgisFeatureInputStream(Connection conn, String queryString) {
+ public PostgisFeatureInputStream(Connection conn, String queryString) {
this(conn, queryString, null);
}
@@ -30,6 +26,7 @@
*/
@Override
protected SpatialDatabasesResultSetConverter
getResultSetConverter(ResultSet rs) {
- return new PostgisResultSetConverter(conn, rs);
+ return new PostgisResultSetConverter(conn, rs);
}
+
}
Modified:
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/SpatialDatabasesDSMetadata.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/SpatialDatabasesDSMetadata.java
2016-02-06 11:26:43 UTC (rev 4819)
+++
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/SpatialDatabasesDSMetadata.java
2016-02-07 10:15:46 UTC (rev 4820)
@@ -392,12 +392,8 @@
String schemaName = this.getSchemaName(dsName);
String tableName = this.getTableName(dsName);
try {
- if (schemaName.equals(dsName)) {
- // no schema defined in given dataset name: use default one
- schemaName = this.getDefaultSchemaName();
- }
DatabaseMetaData dbMd = this.conn.getJdbcConnection().getMetaData();
- rs = dbMd.getIndexInfo(null, this.getSchemaName(dsName),
this.getTableName(dsName), false, true);
+ rs = dbMd.getIndexInfo(null, schemaName, tableName, false, true);
while (rs.next()) {
if (column.equals(rs.getString(9)) && rs.getString(6) != null &&
rs.getString(9) != null) {
ret = true;
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
