Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.165
retrieving revision 1.166
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.165 -r1.166
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
+ - 2004-11-10 AP 1.2RC2 Remove tablespace from schema (pgsql post-beta4 change)
- 2004-11-10 AP 1.2RC2 Fix properties for multiply inherited tables (r: Riccardo G. Facchini)
- 2004-11-10 AP 1.2RC2 Fix OSX issue (r: Patrick Hatcher)
- 2004-11-09 AP 1.2RC2 Fix remembering SSL connection parameter (r: Justin Clift)
Index: pgSchema.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgSchema.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/include/pgSchema.h -Lsrc/include/pgSchema.h -u -w -r1.22 -r1.23
--- src/include/pgSchema.h
+++ src/include/pgSchema.h
@@ -40,8 +40,6 @@
void iSetSchemaTyp(const long l) { schemaTyp=l; }
bool GetCreatePrivilege() const { return createPrivilege; }
void iSetCreatePrivilege(const bool b) { createPrivilege=b; }
- wxString GetTablespace() const { return tablespace; };
- void iSetTablespace(const wxString& newVal) { tablespace = newVal; }
bool GetSystemObject() const { return schemaTyp < 1; }
bool CanBackup() { return true; }
@@ -56,7 +54,6 @@
private:
long schemaTyp; // 0: System 1: temporär 2: normal
bool createPrivilege;
- wxString tablespace;
};
#endif
Index: pgSchema.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgSchema.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/schema/pgSchema.cpp -Lsrc/schema/pgSchema.cpp -u -w -r1.37 -r1.38
--- src/schema/pgSchema.cpp
+++ src/schema/pgSchema.cpp
@@ -70,8 +70,6 @@
+ wxT("\n\nCREATE SCHEMA ") + qtIdent(GetName())
+ wxT("\n AUTHORIZATION ") + qtIdent(GetOwner());
- AppendIfFilled(sql, wxT(" TABLESPACE "), qtIdent(tablespace));
-
sql += wxT(";\n")
+ GetGrant(wxT("UC"), wxT("SCHEMA ") + GetQuotedFullIdentifier())
+ GetCommentSql();
@@ -152,8 +150,6 @@
properties->AppendItem(_("Name"), GetName());
properties->AppendItem(_("OID"), GetOid());
properties->AppendItem(_("Owner"), GetOwner());
- if (!tablespace.IsEmpty())
- properties->AppendItem(_("Tablespace"), tablespace);
properties->AppendItem(_("ACL"), GetAcl());
properties->AppendItem(_("System schema?"), GetSystemObject());
properties->AppendItem(_("Comment"), GetComment());
@@ -181,22 +177,7 @@
{
pgSchema *schema=0;
- pgSet *schemas;
- if (collection->GetConnection()->BackendMinimumVersion(7, 5))
- schemas = collection->GetDatabase()->ExecuteSet(
- wxT("SELECT CASE WHEN nspname LIKE 'pg\\_temp\\_%%' THEN 1\n")
- wxT(" WHEN nsp.oid<") + NumToStr(collection->GetServer()->GetLastSystemOID()) +
- wxT(" OR nspname like 'pg\\_%' THEN 0\n")
- wxT(" ELSE 2 END AS nsptyp,\n")
- wxT(" nsp.nspname, spcname, nsp.oid, pg_get_userbyid(nspowner) AS namespaceowner, nspacl, description,")
- wxT(" has_schema_privilege(nsp.oid, 'CREATE') as cancreate\n")
- wxT(" FROM pg_namespace nsp\n")
- wxT(" LEFT OUTER JOIN pg_tablespace ta on ta.oid=nsptablespace\n")
- wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=nsp.oid\n")
- + restriction +
- wxT(" ORDER BY 1, nspname"));
-else
- schemas = collection->GetDatabase()->ExecuteSet(
+ pgSet *schemas = collection->GetDatabase()->ExecuteSet(
wxT("SELECT CASE WHEN nspname LIKE 'pg\\_temp\\_%%' THEN 1\n")
wxT(" WHEN nsp.oid<") + NumToStr(collection->GetServer()->GetLastSystemOID()) +
wxT(" OR nspname like 'pg\\_%' THEN 0\n")
@@ -221,8 +202,6 @@
schema->iSetAcl(schemas->GetVal(wxT("nspacl")));
schema->iSetSchemaTyp(schemas->GetLong(wxT("nsptyp")));
schema->iSetCreatePrivilege(schemas->GetBool(wxT("cancreate")));
- if (collection->GetConnection()->BackendMinimumVersion(7, 5))
- schema->iSetTablespace(schemas->GetVal(wxT("spcname")));
if (browser)
{
Index: dlgSequence.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgSequence.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/ui/dlgSequence.cpp -Lsrc/ui/dlgSequence.cpp -u -w -r1.28 -r1.29
--- src/ui/dlgSequence.cpp
+++ src/ui/dlgSequence.cpp
@@ -90,7 +90,7 @@
txtCache->Disable();
chkCycled->Disable();
}
- PrepareTablespace(cbTablespace, schema->GetTablespace());
+ PrepareTablespace(cbTablespace, sequence->GetTablespace());
}
else
{
Index: dlgSchema.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgSchema.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/ui/dlgSchema.cpp -Lsrc/ui/dlgSchema.cpp -u -w -r1.17 -r1.18
--- src/ui/dlgSchema.cpp
+++ src/ui/dlgSchema.cpp
@@ -23,11 +23,8 @@
// pointer to controls
-#define cbTablespace CTRL_COMBOBOX("cbTablespace")
BEGIN_EVENT_TABLE(dlgSchema, dlgSecurityProperty)
- EVT_TEXT(XRCID("cbTablespace"), dlgProperty::OnChange)
- EVT_COMBOBOX(XRCID("cbTablespace"), dlgProperty::OnChange)
END_EVENT_TABLE();
@@ -55,17 +52,13 @@
if (schema)
{
// edit mode
- PrepareTablespace(cbTablespace, schema->GetTablespace());
if (!connection->BackendMinimumVersion(7, 5))
cbOwner->Disable();
- if (!connection->BackendMinimumVersion(7, 6))
- cbTablespace->Disable();
}
else
{
// create mode
- PrepareTablespace(cbTablespace);
}
return dlgSecurityProperty::Go(modal);
@@ -117,7 +110,6 @@
// create mode
sql = wxT("CREATE SCHEMA ") + qtIdent(name);
AppendIfFilled(sql, wxT("\n AUTHORIZATION "), qtIdent(cbOwner->GetValue()));
- AppendIfFilled(sql, wxT("\n TABLESPACE "), qtIdent(cbTablespace->GetValue()));
sql += wxT(";\n");
}
Index: dlgSchema.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgSchema.xrc,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/common/dlgSchema.xrc -Lsrc/ui/common/dlgSchema.xrc -u -w -r1.10 -r1.11
--- src/ui/common/dlgSchema.xrc
+++ src/ui/common/dlgSchema.xrc
@@ -32,23 +32,13 @@
135,12d
-
-