SVN Commit by dpage: r4266 - in branches/REL-1_2_0_PATCHES/pgadmin3: . src src/schema - Mailing list pgadmin-hackers

Author: dpage
Date: 2005-05-31 09:30:20 +0100 (Tue, 31 May 2005)
New Revision: 4266

Modified:
   branches/REL-1_2_0_PATCHES/pgadmin3/CHANGELOG.txt
   branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp
   branches/REL-1_2_0_PATCHES/pgadmin3/src/schema/pgDomain.cpp
Log:
Fix domain RE SQL, per Ivan

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-05-31 08:17:52 UTC (rev 4265)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-05-31 08:30:20 UTC (rev 4266)
@@ -17,7 +17,7 @@
 </ul>
 <br>
 <ul>
-
+    <li>2005-05-31 DP  1.2.3 Fix domain RE SQL, per Ivan
     <li>2005-05-31 DP  1.2.3 Add missing ; to RE SQL, per Ivan
     <li>2005-05-10 HS  1.2.2 Display comments on contraints properly
     <li>2005-04-22 AP  1.2.2 compiles with wx2.6

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp    2005-05-31 08:17:52 UTC (rev 4265)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp    2005-05-31 08:30:20 UTC (rev 4266)
@@ -45,8 +45,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.6/include" /I
"c:/wxWidgets-2.6/contrib/include"/I "c:/wxWidgets-2.6/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS"/D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D
"STRICT"/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /FAcs /FR /FD /c 
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"__WINDOWS__"/D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D
wxUSE_UNICODE=1/D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Yu"pgadmin3.h" /FD /c 
-# SUBTRACT CPP /Fr
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"__WINDOWS__"/D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D
wxUSE_UNICODE=1/D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /i "c:/wxWidgets-2.6/contrib/include" /d "_DEBUG"

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/schema/pgDomain.cpp
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/src/schema/pgDomain.cpp    2005-05-31 08:17:52 UTC (rev 4265)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/src/schema/pgDomain.cpp    2005-05-31 08:30:20 UTC (rev 4266)
@@ -67,7 +67,7 @@
         if (GetConnection()->BackendMinimumVersion(7, 4))
         {
             pgSet *set=ExecuteSet(
-                wxT("SELECT conname, consrc FROM pg_constraint WHERE contypid=") + GetOidStr());
+                wxT("SELECT conname, pg_get_constraintdef(oid) AS consrc FROM pg_constraint WHERE contypid=") +
GetOidStr());
             if (set)
             {
                 while (!set->Eof())
@@ -78,8 +78,8 @@
                     }
                     wxString conname=set->GetVal(wxT("conname"));
                     if (!conname.StartsWith(wxT("$")))
-                        check += wxT("CONSTRAINT ") + conname + wxT(" ");
-                    check += wxT("CHECK ") + set->GetVal(wxT("consrc"));
+                        check += wxT("CONSTRAINT ") + qtIdent(conname) + wxT(" ");
+                    check += set->GetVal(wxT("consrc"));

                     set->MoveNext();
                 }