Merge branch 'release-v2.0' into 2.0-dataset-sources

This commit is contained in:
amercader 2013-02-05 12:35:14 +00:00
commit ca7819b885
1 changed files with 5 additions and 1 deletions

View File

@ -373,7 +373,7 @@ def migrate_v3():
ALTER TABLE harvest_object ALTER TABLE harvest_object
ADD COLUMN import_started timestamp without time zone, ADD COLUMN import_started timestamp without time zone,
ADD COLUMN import_finished timestamp without time zone, ADD COLUMN import_finished timestamp without time zone,
ADD COLUMN "state" text; ADD COLUMN "state" text,
ADD COLUMN "report_status" text; ADD COLUMN "report_status" text;
ALTER TABLE harvest_source ALTER TABLE harvest_source
@ -394,6 +394,10 @@ UPDATE harvest_source set frequency = 'MANUAL';
ALTER TABLE harvest_object DROP CONSTRAINT harvest_object_package_id_fkey; ALTER TABLE harvest_object DROP CONSTRAINT harvest_object_package_id_fkey;
ALTER TABLE harvest_object ALTER TABLE harvest_object
ADD CONSTRAINT harvest_object_package_id_fkey FOREIGN KEY (package_id) REFERENCES package(id) DEFERRABLE; ADD CONSTRAINT harvest_object_package_id_fkey FOREIGN KEY (package_id) REFERENCES package(id) DEFERRABLE;
ALTER TABLE harvest_object_error
ADD COLUMN line integer;
""" """
conn.execute(statement) conn.execute(statement)
Session.commit() Session.commit()