Index: sysSettings.h =================================================================== RCS file: /projects/pgadmin3/src/include/sysSettings.h,v retrieving revision 1.38 retrieving revision 1.39 diff -Lsrc/include/sysSettings.h -Lsrc/include/sysSettings.h -u -w -r1.38 -r1.39 --- src/include/sysSettings.h +++ src/include/sysSettings.h @@ -107,7 +107,7 @@ void SetSQLFont(const wxFont &font) { sqlFont = font; } wxString GetCanonicalLanguage() const { return canonicalLanguage; } - bool Write(const wxString &key, const wxString &value) { return wxConfig::Write(key, value); } + bool Write(const wxString &key, const wxChar *value) { return wxConfig::Write(key, value); } bool Write(const wxString &key, long value) { return wxConfig::Write(key, value); } bool Write(const wxString &key, int value) { return wxConfig::Write(key, value); } bool Write(const wxString &key, bool value); Index: pgForeignKey.cpp =================================================================== RCS file: /projects/pgadmin3/src/schema/pgForeignKey.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -Lsrc/schema/pgForeignKey.cpp -Lsrc/schema/pgForeignKey.cpp -u -w -r1.28 -r1.29 --- src/schema/pgForeignKey.cpp +++ src/schema/pgForeignKey.cpp @@ -42,14 +42,13 @@ wxString pgForeignKey::GetDefinition() { wxString sql; - // MATCH FULL/PARTIAL missing; where is this stored?!? sql = wxT("(") + GetQuotedFkColumns() + wxT(")\n REFERENCES ") + GetQuotedSchemaPrefix(GetRefSchema()) + qtIdent(GetReferences()) + wxT(" (") + GetQuotedRefColumns() + wxT(")"); - if (GetDatabase()->BackendMinimumVersion(7, 4)) + if (GetDatabase()->BackendMinimumVersion(7, 4) || GetMatch() == wxT("FULL")) sql += wxT(" MATCH ") + GetMatch(); sql += wxT("\n ON UPDATE ") + GetOnUpdate() Index: sysSettings.cpp =================================================================== RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.70 -r1.71 --- src/utils/sysSettings.cpp +++ src/utils/sysSettings.cpp @@ -207,7 +207,7 @@ bool sysSettings::Write(const wxString &key, bool value) { - Write(key, BoolToStr(value)); + return Write(key, BoolToStr(value)); } bool sysSettings::Write(const wxString &key, const wxPoint &value)