replace SQLite Statement getGeneratedKeys usage with RETURNING clause

Author: bosborn

src/main/java/mil/nga/geopackage/db/SQLUtils.java

@@ -418,8 +418,43 @@ public static int update(Connection connection, String table,
 	 */
 	public static long insert(Connection connection, String table,
 			ContentValues values) {
+		return insert(connection, table, null, values);
+	}
+
+	/**
+	 * Insert a new row
+	 * 
+	 * @param connection
+	 *            connection
+	 * @param table
+	 *            table name
+	 * @param values
+	 *            content values
+	 * @return row id
+	 */
+	public static long insertOrThrow(Connection connection, String table,
+			ContentValues values) {
+		return insertOrThrow(connection, table, null, values);
+	}
+
+	/**
+	 * Insert a new row
+	 * 
+	 * @param connection
+	 *            connection
+	 * @param table
+	 *            table name
+	 * @param pkColumn
+	 *            primary key id column
+	 * @param values
+	 *            content values
+	 * @return row id or -1 on an exception
+	 * @since 6.6.2
+	 */
+	public static long insert(Connection connection, String table,
+			String pkColumn, ContentValues values) {
 		try {
-			return insertOrThrow(connection, table, values);
+			return insertOrThrow(connection, table, pkColumn, values);
 		} catch (Exception e) {
 			log.log(Level.WARNING, "Error inserting into table: " + table
 					+ ", Values: " + values, e);
@@ -434,12 +469,15 @@ public static long insert(Connection connection, String table,
 	 *            connection
 	 * @param table
 	 *            table name
+	 * @param pkColumn
+	 *            primary key id column
 	 * @param values
 	 *            content values
 	 * @return row id
+	 * @since 6.6.2
 	 */
 	public static long insertOrThrow(Connection connection, String table,
-			ContentValues values) {
+			String pkColumn, ContentValues values) {
 
 		StringBuilder insert = new StringBuilder();
 		insert.append("insert into ").append(CoreSQLUtils.quoteWrap(table))
@@ -462,6 +500,12 @@ public static long insertOrThrow(Connection connection, String table,
 		}
 		insert.append(')');
 
+		if (pkColumn == null) {
+			pkColumn = CoreSQLUtils.ROWID_COLUMN;
+		}
+		insert.append(" returning ");
+		insert.append(CoreSQLUtils.quoteWrap(pkColumn));
+
 		String sql = insert.toString();
 
 		PreparedStatement statement = null;
@@ -470,23 +514,21 @@ public static long insertOrThrow(Connection connection, String table,
 		try {
 			statement = connection.prepareStatement(sql);
 			setArguments(statement, args);
-			int count = statement.executeUpdate();
+			boolean result = statement.execute();
 
+			while (result) {
+				ResultSet resultSet = statement.getResultSet();
+				id = resultSet.getLong(pkColumn);
+				result = statement.getMoreResults();
+			}
+
+			int count = statement.getUpdateCount();
 			if (count == 0) {
 				throw new GeoPackageException(
 						"Failed to execute SQL insert statement: " + sql
 								+ ". No rows added from execution.");
 			}
 
-			try (ResultSet generatedKeys = statement.getGeneratedKeys()) {
-				if (generatedKeys.next()) {
-					id = generatedKeys.getLong(1);
-				} else {
-					throw new GeoPackageException(
-							"Failed to execute SQL insert statement: " + sql
-									+ ". No row id was found.");
-				}
-			}
 		} catch (SQLException e) {
 			throw new GeoPackageException(
 					"Failed to execute SQL insert statement: " + sql, e);

src/main/java/mil/nga/geopackage/user/UserDao.java

@@ -157,7 +157,7 @@ public int update(ContentValues values, String whereClause,
 	@Override
 	public long insert(TRow row) {
 		long id = SQLUtils.insertOrThrow(connection, getTableName(),
-				row.toContentValues(false));
+				getPkColumnName(), row.toContentValues(false));
 		if (row.hasIdColumn()) {
 			row.setId(id, true);
 		}
@@ -172,7 +172,8 @@ public long insert(TRow row) {
 	 * @return row id, -1 on error
 	 */
 	public long insert(ContentValues values) {
-		return SQLUtils.insert(connection, getTableName(), values);
+		return SQLUtils.insert(connection, getTableName(), getPkColumnName(),
+				values);
 	}
 
 	/**
@@ -183,7 +184,8 @@ public long insert(ContentValues values) {
 	 * @return row id
 	 */
 	public long insertOrThrow(ContentValues values) {
-		return SQLUtils.insertOrThrow(connection, getTableName(), values);
+		return SQLUtils.insertOrThrow(connection, getTableName(),
+				getPkColumnName(), values);
 	}
 
 }