Log Message:
-----------
Sequence schema fix
Modified Files:
--------------
pgadmin3:
CHANGELOG.txt (r1.127 -> r1.128)
pgadmin3/src/schema:
pgServer.cpp (r1.51 -> r1.52)
pgadmin3/src/ui:
dlgSequence.cpp (r1.24 -> r1.25)
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.127
retrieving revision 1.128
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.127 -r1.128
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2004-08-29 AP Sequence schema fix
<li>2004-08-25 DAP Prevent crash when non-superuser views database
properties.
<li>2004-08-18 AP set PGPASSWORD environment for backup/restore
<li>2004-08-18 AP fix ACL for quoted user/group names
Index: pgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgServer.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lsrc/schema/pgServer.cpp -Lsrc/schema/pgServer.cpp -u -w -r1.51 -r1.52
--- src/schema/pgServer.cpp
+++ src/schema/pgServer.cpp
@@ -226,7 +226,7 @@
if (serviceId.Find('\\') < 0)
scmHandle = OpenSCManager(0, SERVICES_ACTIVE_DATABASE, GENERIC_EXECUTE);
else
- scmHandle = OpenSCManager(serviceId.BeforeFirst('\\'),
SERVICES_ACTIVE_DATABASE, GENERIC_EXECUTE|GENERIC_READ);
+ scmHandle = OpenSCManager(wxT("\\\\") + serviceId.BeforeFirst('\\'),
SERVICES_ACTIVE_DATABASE, GENERIC_EXECUTE|GENERIC_READ);
if (scmHandle)
serviceHandle=OpenService(scmHandle, serviceId.AfterLast('\\'),
GENERIC_EXECUTE|GENERIC_READ);
Index: dlgSequence.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgSequence.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/ui/dlgSequence.cpp -Lsrc/ui/dlgSequence.cpp -u -w -r1.24 -r1.25
--- src/ui/dlgSequence.cpp
+++ src/ui/dlgSequence.cpp
@@ -195,27 +195,26 @@
if (!tmp.IsEmpty())
{
- sql += wxT("ALTER SEQUENCE ") + qtIdent(name)
+ sql += wxT("ALTER SEQUENCE ") + schema->GetQuotedPrefix() +
qtIdent(name)
+ tmp + wxT(";\n");
}
-
}
else
{
if (txtStart->GetValue() != sequence->GetLastValue().ToString())
- sql += wxT("SELECT setval('") + qtString(name)
+ sql += wxT("SELECT setval('") + qtString(schema->GetName()) +
wxT(".") + qtString(name)
+ wxT("', ") + txtStart->GetValue()
+ wxT(");\n");
}
if (cbTablespace->GetValue() != sequence->GetTablespace())
- sql += wxT("ALTER TABLE ") + qtIdent(name)
+ sql += wxT("ALTER TABLE ") + schema->GetQuotedPrefix()+ qtIdent(name)
+ wxT(" SET TABLESPACE ") + qtIdent(cbTablespace->GetValue())
+ wxT(";\n");
}
else
{
// create mode
- sql = wxT("CREATE SEQUENCE ") + schema->GetQuotedPrefix() +
qtIdent(GetName());
+ sql = wxT("CREATE SEQUENCE ") + schema->GetQuotedPrefix() + qtIdent(name);
if (chkCycled->GetValue())
sql += wxT(" CYCLE");
AppendIfFilled(sql, wxT("\n INCREMENT "), txtIncrement->GetValue());
@@ -228,12 +227,12 @@
sql += wxT(";\n");
if (cbOwner->GetGuessedSelection() > 0)
{
- sql += wxT("ALTER TABLE ") + schema->GetQuotedPrefix() +
qtIdent(GetName())
+ sql += wxT("ALTER TABLE ") + schema->GetQuotedPrefix() + qtIdent(name)
+ wxT(" OWNER TO ") + qtIdent(cbOwner->GetValue()) + wxT(";\n");
}
}
- sql += GetGrant(wxT("arwdRxt"), wxT("TABLE ") + schema->GetQuotedPrefix() +
qtIdent(GetName()));
+ sql += GetGrant(wxT("arwdRxt"), wxT("TABLE ") + schema->GetQuotedPrefix() +
qtIdent(name));
AppendComment(sql, wxT("SEQUENCE"), schema, sequence);
return sql;
---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings
