Revision 20908 trunk/libraries/libFMap_dataDB/src/org/gvsig/data/datastores/vectorial/db/jdbc/h2/H2Utils.java
H2Utils.java | ||
---|---|---|
14 | 14 |
import org.gvsig.data.exception.InitializeException; |
15 | 15 |
import org.gvsig.data.exception.ReadException; |
16 | 16 |
import org.gvsig.data.vectorial.AttributeDescriptor; |
17 |
import org.gvsig.data.vectorial.FeatureType; |
|
17 | 18 |
import org.gvsig.data.vectorial.IFeatureAttributeDescriptor; |
18 | 19 |
import org.gvsig.data.vectorial.IsNotAttributeSettingException; |
19 | 20 |
|
... | ... | |
101 | 102 |
|
102 | 103 |
while (true){ |
103 | 104 |
if (rsAllMeta.isAfterLast()){ |
104 |
attr = getAttributeFromJDBC(conn,rsMetadata,i); |
|
105 |
attr = getAttributeFromJDBC(featureType,conn,rsMetadata,i);
|
|
105 | 106 |
featureType.add(attr); |
106 | 107 |
// attr.setOrdinal(i-1); |
107 | 108 |
break; |
108 | 109 |
} else if(rsAllMeta.getString("COLUMN_NAME").equals(colName)){ |
109 |
attr = getAttributeFromJDBC(conn,rsAllMeta); |
|
110 |
attr = getAttributeFromJDBC(featureType,conn,rsAllMeta);
|
|
110 | 111 |
featureType.add(attr); |
111 | 112 |
// attr.setOrdinal(i-1); |
112 | 113 |
break; |
... | ... | |
243 | 244 |
|
244 | 245 |
} |
245 | 246 |
|
246 |
private static AttributeDescriptor getAttributeFromJDBC(Connection conn,ResultSetMetaData rsMetadata,int colIndex) throws SQLException{ |
|
247 |
DBAttributeDescriptor column= new DBAttributeDescriptor();
|
|
247 |
private static AttributeDescriptor getAttributeFromJDBC(FeatureType fType,Connection conn,ResultSetMetaData rsMetadata,int colIndex) throws SQLException{
|
|
248 |
DBAttributeDescriptor column= (DBAttributeDescriptor) fType.createAttributeDescriptor();
|
|
248 | 249 |
try { |
249 | 250 |
column.loading(); |
250 | 251 |
column.setName(rsMetadata.getColumnName(colIndex)); |
... | ... | |
318 | 319 |
|
319 | 320 |
} |
320 | 321 |
|
321 |
private static AttributeDescriptor getAttributeFromJDBC(Connection conn, ResultSet rsMetadata) throws SQLException{ |
|
322 |
DBAttributeDescriptor column= new DBAttributeDescriptor();
|
|
322 |
private static AttributeDescriptor getAttributeFromJDBC(FeatureType fType, Connection conn, ResultSet rsMetadata) throws SQLException{
|
|
323 |
DBAttributeDescriptor column= (DBAttributeDescriptor) fType.createAttributeDescriptor();
|
|
323 | 324 |
try { |
324 | 325 |
column.loading(); |
325 | 326 |
column.setName(rsMetadata.getString("COLUMN_NAME")); |
Also available in: Unified diff