Skip to content

OFBIZ-13413 - Fix JdbcSQLDataException during startup caused by null table parameter in getPrimaryKeys #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashishvijaywargiya wants to merge 1 commit into
base: trunk
Choose a base branch
from
+2 −10
Open

OFBIZ-13413 - Fix JdbcSQLDataException during startup caused by null table parameter in getPrimaryKeys #1229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,20 +1228,12 @@ private Map<String, Map<String, ColumnCheckInfo>> getColumnInfo(Set<String> tabl

// first try getting all at once for databases that support that and can generally perform WAY better, if that fails get one at
// a time so it will at least work
try (ResultSet rsPks = dbData.getPrimaryKeys(null, lookupSchemaName, null)) {
try (ResultSet rsPks = dbData.getPrimaryKeys(null, lookupSchemaName, "%")) {
pkCount += checkPrimaryKeyInfo(rsPks, lookupSchemaName, needsUpperCase, colInfo, messages);
} catch (Exception e1) {
Debug.logInfo("Error getting primary key info from database with null tableName, will try other means: " + e1.toString(),
Debug.logInfo("Error getting primary key info from database with % tableName, will try other means: " + e1.toString(),
MODULE);
}
if (pkCount == 0) {
try (ResultSet rsPks = dbData.getPrimaryKeys(null, lookupSchemaName, "%")) {
pkCount += checkPrimaryKeyInfo(rsPks, lookupSchemaName, needsUpperCase, colInfo, messages);
} catch (Exception e1) {
Debug.logInfo("Error getting primary key info from database with % tableName, will try other means: " + e1.toString(),
MODULE);
}
}
if (pkCount == 0) {
Debug.logInfo("Searching in " + tableNames.size() + " tables for primary key fields ...", MODULE);
for (String curTable : tableNames) {
Expand Down
Loading