Revision 58
| trunk/org.gvsig.postgresql/pom.xml | ||
|---|---|---|
| 11 | 11 |
<parent> |
| 12 | 12 |
<groupId>org.gvsig</groupId> |
| 13 | 13 |
<artifactId>org.gvsig.desktop</artifactId> |
| 14 |
<version>2.0.24</version>
|
|
| 14 |
<version>2.0.39</version>
|
|
| 15 | 15 |
</parent> |
| 16 | 16 |
|
| 17 | 17 |
<url>https://devel.gvsig.org/redmine/projects/gvsig-postgresql</url> |
| ... | ... | |
| 20 | 20 |
<developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-postgresql/trunk/org.gvsig.postgresql</developerConnection> |
| 21 | 21 |
<url>https://devel.gvsig.org/redmine/projects/gvsig-postgresql/repository/show/trunk/org.gvsig.postgresql</url> |
| 22 | 22 |
</scm> |
| 23 |
|
|
| 24 |
<repositories> |
|
| 25 |
<repository> |
|
| 26 |
<id>gvsig-public-http-repository</id> |
|
| 27 |
<name>gvSIG maven public HTTP repository</name> |
|
| 28 |
<url>http://devel.gvsig.org/m2repo/j2se</url> |
|
| 29 |
<releases> |
|
| 30 |
<enabled>true</enabled> |
|
| 31 |
<updatePolicy>daily</updatePolicy> |
|
| 32 |
<checksumPolicy>warn</checksumPolicy> |
|
| 33 |
</releases> |
|
| 34 |
<snapshots> |
|
| 35 |
<enabled>true</enabled> |
|
| 36 |
<updatePolicy>daily</updatePolicy> |
|
| 37 |
<checksumPolicy>warn</checksumPolicy> |
|
| 38 |
</snapshots> |
|
| 39 |
</repository> |
|
| 40 |
</repositories> |
|
| 23 | 41 |
|
| 24 | 42 |
|
| 25 | 43 |
<build> |
| trunk/org.gvsig.postgresql/org.gvsig.postgresql.provider/src/main/java/org/gvsig/fmap/dal/store/postgresql/PostgreSQLServerExplorer.java | ||
|---|---|---|
| 157 | 157 |
String sqlDeleteFromGeometry_column = strb.toString(); |
| 158 | 158 |
try{
|
| 159 | 159 |
try{
|
| 160 |
logger.debug("execute: "+sqlDrop);
|
|
| 160 | 161 |
st.execute(sqlDrop); |
| 161 | 162 |
} catch (SQLException e) {
|
| 162 | 163 |
throw new JDBCExecuteSQLException(sqlDrop, e); |
| 163 | 164 |
} |
| 164 | 165 |
|
| 165 | 166 |
try {
|
| 167 |
logger.debug("execute: "+sqlDeleteFromGeometry_column);
|
|
| 166 | 168 |
st.execute(sqlDeleteFromGeometry_column); |
| 167 | 169 |
} catch (SQLException e) {
|
| 168 | 170 |
throw new JDBCExecuteSQLException( |
| trunk/org.gvsig.postgresql/org.gvsig.postgresql.provider/src/main/java/org/gvsig/fmap/dal/store/postgresql/PostgreSQLHelper.java | ||
|---|---|---|
| 599 | 599 |
pgGeomType = "MULTIPOLYGON"; |
| 600 | 600 |
break; |
| 601 | 601 |
default: |
| 602 |
throw new UnsupportedGeometryException(geometryType,
|
|
| 603 |
geometrySubType);
|
|
| 602 |
logger.warn("Can't determine PostGIS geometry type, use GEOMETRY.");
|
|
| 603 |
pgGeomType = "GEOMETRY";
|
|
| 604 | 604 |
} |
| 605 | 605 |
if (geometrySubType == Geometry.SUBTYPES.GEOM2DM |
| 606 | 606 |
|| geometrySubType == Geometry.SUBTYPES.GEOM3DM) {
|
| 607 | 607 |
pgGeomType = pgGeomType + "M"; |
| 608 |
} else if (geometrySubType == Geometry.SUBTYPES.GEOM3D) {
|
|
| 608 |
} /* else if (geometrySubType == Geometry.SUBTYPES.GEOM3D) {
|
|
| 609 | 609 |
throw new UnsupportedGeometryException(geometryType, |
| 610 | 610 |
geometrySubType); |
| 611 |
} |
|
| 611 |
/ |
|
| 612 |
} */ |
|
| 612 | 613 |
return pgGeomType; |
| 613 | 614 |
} |
| 614 | 615 |
|
| ... | ... | |
| 757 | 758 |
|
| 758 | 759 |
// =========================================================================== |
| 759 | 760 |
// TODO Improve this. Keep in mind that MULTIPOLYGON will not accept POLYGON |
| 760 |
strb.append("GEOMETRY");
|
|
| 761 |
/* |
|
| 762 |
strb.append(getPostgisGeomType(attr.getGeometryType(), attr |
|
| 763 |
.getGeometrySubType())); |
|
| 764 |
*/ |
|
| 761 |
// strb.append("GEOMETRY");
|
|
| 762 |
|
|
| 763 |
strb.append( getPostgisGeomType( |
|
| 764 |
attr.getGeometryType(), |
|
| 765 |
attr |
|
| 766 |
.getGeometrySubType() |
|
| 767 |
) |
|
| 768 |
); |
|
| 765 | 769 |
// =========================================================================== |
| 766 | 770 |
strb.append("', ");
|
| 767 | 771 |
strb.append(getPostgisGeomDimensions(attr.getGeometrySubType())); |
| 768 | 772 | |
Also available in: Unified diff