Skip to content

Dat 2596 #112

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
bbrown-at-datical wants to merge 7 commits into
base: ddb
Choose a base branch
from
Open

Dat 2596 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4060b9
DAT-2015 Allow capability to handle EDB Connector driver
wwillard7800 Apr 23, 2019
7b17b18
DAT-2015 Include postrgres
wwillard7800 Jun 3, 2019
67a7221
Merge branch 'DAT-2015' into DAT-2155-merge
wwillard7800 Jun 27, 2019
0ee60ba
Merge remote-tracking branch 'origin/DAT-2155' into DAT-2596
wwillard7800 Jul 10, 2019
fa14db3
Merge remote-tracking branch 'origin/DAT-2155' into DAT-2596
wwillard7800 Jul 18, 2019
500e6a4
Merge branch 'ddb' into DAT-2596
bbrown-at-datical Aug 9, 2019
baa3257
Merge remote-tracking branch 'origin/DAT-2596' into DAT-2596
wwillard7800 Oct 16, 2019
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
7 changes: 2 additions & 5 deletions liquibase-core/src/main/java/liquibase/change/core/CreateProcedureChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
import liquibase.configuration.LiquibaseConfiguration;
import liquibase.database.Database;
import liquibase.database.DatabaseList;
import liquibase.database.core.AbstractDb2Database;
import liquibase.database.core.HsqlDatabase;
import liquibase.database.core.MSSQLDatabase;
import liquibase.database.core.OracleDatabase;
import liquibase.database.core.*;
import liquibase.exception.UnexpectedLiquibaseException;
import liquibase.exception.ValidationErrors;
import liquibase.parser.core.ParsedNode;
Expand Down Expand Up @@ -172,7 +169,7 @@ public ValidationErrors validate(Database database) {
}

if (this.getReplaceIfExists() != null && (DatabaseList.definitionMatches(getDbms(), database, true))) {
if (database instanceof MSSQLDatabase) {
if (database instanceof MSSQLDatabase || database instanceof PostgresDatabase) {
if (this.getReplaceIfExists() && this.getProcedureName() == null) {
validate.addError("procedureName is required if replaceIfExists = true");
}
Expand Down
11 changes: 10 additions & 1 deletion liquibase-core/src/main/java/liquibase/database/core/PostgresDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
*/
public class PostgresDatabase extends AbstractJdbcDatabase {
public static final String PRODUCT_NAME = "PostgreSQL";
public static final String EDB_PRODUCT_NAME = "EnterpriseDB";

private Set<String> systemTablesAndViews = new HashSet<String>();

Expand Down Expand Up @@ -88,14 +89,22 @@ public boolean supportsInitiallyDeferrableColumns() {

@Override
public boolean isCorrectDatabaseImplementation(DatabaseConnection conn) throws DatabaseException {
return PRODUCT_NAME.equalsIgnoreCase(conn.getDatabaseProductName());
boolean matches = PRODUCT_NAME.equalsIgnoreCase(conn.getDatabaseProductName());
if (matches) {
return true;
}
matches = EDB_PRODUCT_NAME.equals(conn.getDatabaseProductName());
return matches;
}

@Override
public String getDefaultDriver(String url) {
if (url.startsWith("jdbc:postgresql:")) {
return "org.postgresql.Driver";
}
else if (url.startsWith("jdbc:edb")) {
return "com.edb.Driver";
}
return null;
}

Expand Down