backend/server/rhnServer/server_packages.py | 2 + schema/spacewalk/common/tables/rhnServerPackage.sql | 2 - schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql | 3 ++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql | 12 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql | 3 ++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql | 5 ---- schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql | 2 - 7 files changed, 22 insertions(+), 7 deletions(-)
New commits: commit 61572a013faec0071ed0f8cada7b47c2c5176cdb Author: Michael Mraka michael.mraka@redhat.com Date: Thu Oct 22 14:55:08 2009 +0200
449167 - allow NULL values (old clients don't send installation time)
diff --git a/schema/spacewalk/common/tables/rhnServerPackage.sql b/schema/spacewalk/common/tables/rhnServerPackage.sql index 808c27d..b55ddf2 100644 --- a/schema/spacewalk/common/tables/rhnServerPackage.sql +++ b/schema/spacewalk/common/tables/rhnServerPackage.sql @@ -27,7 +27,7 @@ CREATE TABLE rhnServerPackage REFERENCES rhnPackageArch (id), created DATE DEFAULT (sysdate) NOT NULL, - installtime DATE NOT NULL + installtime DATE ) TABLESPACE [[server_package_tablespace]] ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql index 092ef8c..9a6493a 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql @@ -1,3 +1,3 @@ ALTER TABLE rhnServerPackage - ADD installtime DATE NOT NULL; + ADD installtime DATE;
commit e9ed7c8a8b96c29e726b560cd70f4c96379d346c Author: Michael Mraka michael.mraka@redhat.com Date: Thu Oct 22 14:53:42 2009 +0200
fixed upgrade scripts for rhnServerPackage.created
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql new file mode 100644 index 0000000..5178813 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql @@ -0,0 +1,3 @@ +ALTER TABLE rhnServerPackage + ADD created DATE; + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql new file mode 100644 index 0000000..55921f8 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql @@ -0,0 +1,12 @@ +begin + loop + update rhnServerPackage + set created = sysdate + where created is null and rownum <= 1000000; + exit when sql%rowcount = 0; + commit; + end loop; + commit; +end; +/ + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql new file mode 100644 index 0000000..a1e2184 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql @@ -0,0 +1,3 @@ +ALTER TABLE rhnServerPackage + MODIFY created DATE DEFAULT (sysdate) NOT NULL; + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql deleted file mode 100644 index 0f02f7a..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE rhnServerPackage - ADD created DATE DEFAULT (sysdate) NOT NULL; - -show errors -
commit 341adeef22d16b354c75b96d0d7dc942ef6fec78 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Oct 22 14:40:52 2009 +0200
449167 - old client don't send installtime but we have to have it defined
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index fb396c1..01afa33 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -48,6 +48,8 @@ class dbPackage: self.a = str(pdict['arch']) if pdict.has_key('installtime'): self.installtime = pdict['installtime'] + else: + self.installtime = None # nvrea is a tuple; we can use tuple as dictionary keys since they are # immutable self.nvrea = (self.n, self.v, self.r, self.e, self.a)
spacewalk-commits@lists.fedorahosted.org