Skip to content

Commit

Permalink
attempt to load column schema during table read
Browse files Browse the repository at this point in the history
  • Loading branch information
bosborn committed Feb 8, 2024
1 parent a9de884 commit a62609b
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/main/java/mil/nga/geopackage/user/UserTableReader.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package mil.nga.geopackage.user;

import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
Expand All @@ -12,6 +13,7 @@
import mil.nga.geopackage.db.table.TableColumn;
import mil.nga.geopackage.db.table.TableConstraints;
import mil.nga.geopackage.db.table.TableInfo;
import mil.nga.geopackage.extension.schema.columns.DataColumnsDao;

/**
* Reads the metadata from an existing user table
Expand Down Expand Up @@ -85,6 +87,7 @@ public TTable readTable(GeoPackageCoreConnection db) {

TableConstraints constraints = SQLiteMaster.queryForConstraints(db,
tableName);
DataColumnsDao dataColumnsDao = DataColumnsDao.create(db);

for (TableColumn tableColumn : tableInfo.getColumns()) {
if (tableColumn.getDataType() == null) {
Expand All @@ -103,6 +106,13 @@ public TTable readTable(GeoPackageCoreConnection db) {
column.addConstraints(columnConstraints);
}

try {
dataColumnsDao.loadSchema(tableName, column);
} catch (SQLException e) {
log.log(Level.WARNING, "Failed to load column schema. table: "
+ tableName + ", column: " + column.getName(), e);
}

columnList.add(column);
}

Expand Down

0 comments on commit a62609b

Please sign in to comment.