[power-architect] r4069 committed - Edited to resolved issue while comparing Data Models using Postgres Da...

[codesite...@google.com]

Revision: 4069
Author: ki...@sqlpower.ca
Date: Thu Apr 23 20:11:31 2015 UTC
Log: Edited to resolved issue while comparing Data Models using
Postgres Database. Related to Bug 3164
https://code.google.com/p/power-architect/source/detail?r=4069

Modified:
/trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMFormatter.java

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Thu Apr 23 19:10:51 2015 UTC
+++ /trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Thu Apr 23 20:11:31 2015 UTC
@@ -1230,7 +1230,7 @@
* @return the value of targetCatalog
*/
public String getTargetCatalog() {
- return this.targetCatalog;
+ return getQuotedPhysicalName(this.targetCatalog);
}

/**
@@ -1248,7 +1248,7 @@
* @return the value of targetSchema
*/
public String getTargetSchema() {
- return this.targetSchema;
+ return getQuotedPhysicalName(this.targetSchema);
}

/**
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMFormatter.java
Thu Nov 25 21:42:55 2010 UTC
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMFormatter.java
Thu Apr 23 20:11:31 2015 UTC
@@ -160,8 +160,8 @@
gen = dmSetting.getDdlGenerator().newInstance();
SQLCatalog cat = (SQLCatalog)
dmSetting.getSourceSettings().getCatalogObject();
SQLSchema sch = (SQLSchema)
dmSetting.getSourceSettings().getSchemaObject();
- gen.setTargetCatalog(cat == null ? null :
cat.getPhysicalName());
- gen.setTargetSchema(sch == null ? null :
sch.getPhysicalName());
+ gen.setTargetCatalog(cat == null ? null :
gen.getPhysicalName(cat));
+ gen.setTargetSchema(sch == null ? null :
gen.getPhysicalName(sch));
} else if
(dmSetting.getOutputFormat().equals(CompareDMSettings.OutputFormat.LIQUIBASE))
{
gen = new LiquibaseDDLGenerator();
LiquibaseDDLGenerator lbgen = (LiquibaseDDLGenerator)gen;