Log Message:
-----------
Fix tablespace reference in namespace
Tags:
----
REL-1_2_0_PATCHES
Modified Files:
--------------
pgadmin3:
CHANGELOG.txt (r1.171 -> r1.171.2.1)
pgadmin3/src/utils:
misc.cpp (r1.62 -> r1.62.2.1)
pgadmin3/src/schema:
pgTablespace.cpp (r1.9 -> r1.9.2.1)
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.171
retrieving revision 1.171.2.1
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.171 -r1.171.2.1
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,11 +17,12 @@
</ul>
<br>
<ul>
- <li>2004-11-19 AP 1.2RC3 catch possible false error msg
- <li>2004-11-19 AP 1.2RC3 fix tables statistics
- <li>2004-11-18 AP 1.2RC3 fix change column dialog (r: Walter Haslbeck)
- <li>2004-11-18 AP 1.2RC3 fix missing schema in EditGrid (r: Martin Susil)
- <li>2004-11-16 AP 1.2RC3 fix pg_dump option
+ <li>2004-12-06 AP 1.2.1 Fix tablespace reference in namespace
+ <li>2004-11-19 AP 1.2.0 catch possible false error msg
+ <li>2004-11-19 AP 1.2.0 fix tables statistics
+ <li>2004-11-18 AP 1.2.0 fix change column dialog (r: Walter Haslbeck)
+ <li>2004-11-18 AP 1.2.0 fix missing schema in EditGrid (r: Martin Susil)
+ <li>2004-11-16 AP 1.2.0 fix pg_dump option
<li>2004-11-10 AP 1.2RC2 Remove tablespace from schema (pgsql post-beta4
change)
<li>2004-11-10 AP 1.2RC2 Fix properties for multiply inherited tables (r:
Riccardo G. Facchini)
<li>2004-11-10 AP 1.2RC2 Fix OSX issue (r: Patrick Hatcher)
Index: misc.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/misc.cpp,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -Lsrc/utils/misc.cpp -Lsrc/utils/misc.cpp -u -w -r1.62 -r1.62.2.1
--- src/utils/misc.cpp
+++ src/utils/misc.cpp
@@ -525,7 +525,7 @@
firstCall=false;
wxString helpdir=docPath + wxT("/") + settings->GetCanonicalLanguage();
- if (!wxFile::Exists(helpdir + wxT("/pgadmin3..hhp")) &&
+ if (!wxFile::Exists(helpdir + wxT("/pgadmin3.hhp")) &&
#if defined(__WXMSW__) || wxUSE_LIBMSPACK
!wxFile::Exists(helpdir + wxT("/pgadmin3.chm")) &&
#endif
Index: pgTablespace.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.9
-r1.9.2.1
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -78,12 +78,6 @@
wxT(" WHERE datname = current_database()\n")
wxT(" AND (cl.reltablespace = ") + GetOidStr() + wxT("\n")
wxT(" OR (cl.reltablespace=0 AND dattablespace = ") +
GetOidStr() + wxT("))\n")
- wxT("UNION ALL\n")
- wxT("SELECT 'n', null, nspname, null\n")
- wxT(" FROM pg_namespace, pg_database\n")
- wxT(" WHERE datname = current_database()\n")
- wxT(" AND (nsptablespace = ") + GetOidStr() + wxT("\n")
- wxT(" OR (nsptablespace=0 AND dattablespace = ") + GetOidStr()
+ wxT("))\n")
wxT(" ORDER BY 1,2,3"));
form->EndMsg();
---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings
