[open-ils-commits] r15314 - branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-01-13 14:29:26 -0500 (Wed, 13 Jan 2010)
New Revision: 15314

Added:
   branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/0119.schema.booking.transits.sql
Removed:
   branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/119.schema.booking.transits.sql
Log:
merge failed to rename this file

Copied: branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/0119.schema.booking.transits.sql (from rev 15312, branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/119.schema.booking.transits.sql)
===================================================================
--- branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/0119.schema.booking.transits.sql	                        (rev 0)
+++ branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/0119.schema.booking.transits.sql	2010-01-13 19:29:26 UTC (rev 15314)
@@ -0,0 +1,15 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0119'); -- miker
+
+CREATE TABLE action.reservation_transit_copy (
+    reservation    INT REFERENCES booking.reservation (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED
+) INHERITS (action.transit_copy);
+ALTER TABLE action.reservation_transit_copy ADD PRIMARY KEY (id);
+ALTER TABLE action.reservation_transit_copy ADD CONSTRAINT artc_tc_fkey FOREIGN KEY (target_copy) REFERENCES booking.resource (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+CREATE INDEX active_reservation_transit_dest_idx ON "action".reservation_transit_copy (dest);
+CREATE INDEX active_reservation_transit_source_idx ON "action".reservation_transit_copy (source);
+CREATE INDEX active_reservation_transit_cp_idx ON "action".reservation_transit_copy (target_copy);
+
+COMMIT;
+

Deleted: branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/119.schema.booking.transits.sql
===================================================================
--- branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/119.schema.booking.transits.sql	2010-01-13 19:04:25 UTC (rev 15313)
+++ branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/119.schema.booking.transits.sql	2010-01-13 19:29:26 UTC (rev 15314)
@@ -1,15 +0,0 @@
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('0119'); -- miker
-
-CREATE TABLE action.reservation_transit_copy (
-    reservation    INT REFERENCES booking.reservation (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED
-) INHERITS (action.transit_copy);
-ALTER TABLE action.reservation_transit_copy ADD PRIMARY KEY (id);
-ALTER TABLE action.reservation_transit_copy ADD CONSTRAINT artc_tc_fkey FOREIGN KEY (target_copy) REFERENCES booking.resource (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
-CREATE INDEX active_reservation_transit_dest_idx ON "action".reservation_transit_copy (dest);
-CREATE INDEX active_reservation_transit_source_idx ON "action".reservation_transit_copy (source);
-CREATE INDEX active_reservation_transit_cp_idx ON "action".reservation_transit_copy (target_copy);
-
-COMMIT;
-