fixes_sql_creation_of_sql_direct.patch

Jose Manuel Vivó Arnal, 11/07/2013 09:35 AM

     					loadFeatureType(conn, featureType, sql, pks, storeParams
     							.getDefaultGeometryField(), schema, table);
     					if (storeParams.getCRS()!=null){
     					if (storeParams.getCRS()!=null && ((EditableFeatureAttributeDescriptor)featureType.getDefaultGeometryAttribute()) != null){
     						((EditableFeatureAttributeDescriptor)featureType.getDefaultGeometryAttribute()).setSRS(storeParams.getCRS());
+    					}

     			long limit, long offset) throws DataException {
     		StringBuilder sql = new StringBuilder();
     		JDBCStoreParameters params = getJDBCParameters();
     		if (directSQLMode) {
     			sql.append(params.getSQL());
     			sql.append(' ');
     		} else {
     			FeatureAttributeDescriptor[] fields = type
     					.getAttributeDescriptors();
-...
     			// table
     			sql.append("from ");
     			sql.append(params.tableID());
     			if (directSQLMode) {
     			    sql.append(" (");
     			    sql.append(params.getSQL());
     	                    sql.append(") as _subquery_alias_ ");
     			} else {
     			    sql.append(params.tableID());
+    			}
     			sql.append(' ');
     			// Where
-...
+    				}
     				sql.append(' ');
+    			}
+    		}
     		// limit offset
     		if (limit > 0 || offset > 0) {
     			sql.append(helper.compoundLimitAndOffset(limit,offset));