Skip to content

Commit c38196b

Browse files
committed
Merge pull request #15 from ngageoint/develop
Develop to Master, 1.1.2 changes
2 parents 568e69e + 8af5e18 commit c38196b

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Adheres to [Semantic Versioning](http://semver.org/).
66

77
## 1.1.2 (TBD)
88

9-
* TBD
9+
* Table Index Extension invalid foreign key fix - [Issue #14](https://github.com/ngageoint/geopackage-core-java/issues/14)
10+
* Execute SQL on GeoPackage method
1011

1112
## [1.1.1](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.1.1) (11-20-2015)
1213

src/main/java/mil/nga/geopackage/GeoPackageCore.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,4 +447,12 @@ public TileMatrixSet createTileTableWithMetadata(String tableName,
447447
*/
448448
public <T, S extends BaseDaoImpl<T, ?>> S createDao(Class<T> type);
449449

450+
/**
451+
* Execute the sql on the GeoPackage database
452+
*
453+
* @param sql
454+
* @since 1.1.2
455+
*/
456+
public void execSQL(String sql);
457+
450458
}

src/main/java/mil/nga/geopackage/property/PropertyConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ public class PropertyConstants {
4747
public static final String SQL = "sql";
4848

4949
public static final String EXTENSIONS = GEO_PACKAGE + PROPERTY_DIVIDER + "extensions";
50-
50+
5151
}

src/main/resources/geopackage.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ geopackage.srs.web_mercator.srs_id=3857
4141
geopackage.srs.web_mercator.organization=EPSG
4242
geopackage.srs.web_mercator.organization_coordsys_id=3857
4343
geopackage.srs.web_mercator.definition=PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]
44-
geopackage.srs.web_mercator.description=Spherical Mercator projection coordinate system
44+
geopackage.srs.web_mercator.description=Spherical Mercator projection coordinate system
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CREATE TABLE nga_table_index (
22
table_name TEXT NOT NULL PRIMARY KEY,
3-
last_indexed DATETIME,
4-
CONSTRAINT fk_nti_ge_tn FOREIGN KEY (table_name) REFERENCES gpkg_extensions(table_name)
3+
last_indexed DATETIME
54
);

0 commit comments

Comments
 (0)