Revision: 2626
https://sourceforge.net/p/mrbs/code/2626/
Author: cimorrison
Date: 2012-12-29 21:06:22 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Dropped the room_id columns from the entry and repeat tables now that
everything has been converted to use the new tables. Next step is to
implement linked bookings, ie bookings spanning multiple rooms.
Modified Paths:
--------------
mrbs/branches/linked_bookings/tables.my.pre41.sql
mrbs/branches/linked_bookings/tables.my.sql
mrbs/branches/linked_bookings/tables.pg.pre73.sql
mrbs/branches/linked_bookings/tables.pg.sql
mrbs/branches/linked_bookings/web/dbsys.inc
Added Paths:
-----------
mrbs/branches/linked_bookings/web/upgrade/37/
mrbs/branches/linked_bookings/web/upgrade/37/mysql.sql
mrbs/branches/linked_bookings/web/upgrade/37/pgsql.sql
Modified: mrbs/branches/linked_bookings/tables.my.pre41.sql
===================================================================
--- mrbs/branches/linked_bookings/tables.my.pre41.sql 2012-12-29 20:46:42 UTC
(rev 2625)
+++ mrbs/branches/linked_bookings/tables.my.pre41.sql 2012-12-29 21:06:22 UTC
(rev 2626)
@@ -82,7 +82,6 @@
end_time int DEFAULT '0' NOT NULL,
entry_type int DEFAULT '0' NOT NULL,
repeat_id int DEFAULT '0' NOT NULL,
- room_id int DEFAULT '1' NOT NULL,
timestamp timestamp,
create_by varchar(80) DEFAULT '' NOT NULL,
name varchar(80) DEFAULT '' NOT NULL,
@@ -126,7 +125,6 @@
rep_type int DEFAULT '0' NOT NULL,
end_date int DEFAULT '0' NOT NULL,
rep_opt varchar(32) DEFAULT '' NOT NULL,
- room_id int DEFAULT '1' NOT NULL,
timestamp timestamp,
create_by varchar(80) DEFAULT '' NOT NULL,
name varchar(80) DEFAULT '' NOT NULL,
@@ -195,6 +193,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '36');
+ VALUES ( 'db_version', '37');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
Modified: mrbs/branches/linked_bookings/tables.my.sql
===================================================================
--- mrbs/branches/linked_bookings/tables.my.sql 2012-12-29 20:46:42 UTC (rev
2625)
+++ mrbs/branches/linked_bookings/tables.my.sql 2012-12-29 21:06:22 UTC (rev
2626)
@@ -82,7 +82,6 @@
end_time int DEFAULT '0' NOT NULL,
entry_type int DEFAULT '0' NOT NULL,
repeat_id int DEFAULT '0' NOT NULL,
- room_id int DEFAULT '1' NOT NULL,
timestamp timestamp,
create_by varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
name varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
@@ -126,7 +125,6 @@
rep_type int DEFAULT '0' NOT NULL,
end_date int DEFAULT '0' NOT NULL,
rep_opt varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
- room_id int DEFAULT '1' NOT NULL,
timestamp timestamp,
create_by varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
name varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
@@ -195,6 +193,6 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '36');
+ VALUES ( 'db_version', '37');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
Modified: mrbs/branches/linked_bookings/tables.pg.pre73.sql
===================================================================
--- mrbs/branches/linked_bookings/tables.pg.pre73.sql 2012-12-29 20:46:42 UTC
(rev 2625)
+++ mrbs/branches/linked_bookings/tables.pg.pre73.sql 2012-12-29 21:06:22 UTC
(rev 2626)
@@ -81,7 +81,6 @@
end_time int DEFAULT 0 NOT NULL,
entry_type int DEFAULT 0 NOT NULL,
repeat_id int DEFAULT 0 NOT NULL,
- room_id int DEFAULT 1 NOT NULL,
timestamp timestamp DEFAULT current_timestamp,
create_by varchar(80) DEFAULT '' NOT NULL,
name varchar(80) DEFAULT '' NOT NULL,
@@ -120,7 +119,6 @@
rep_type int DEFAULT 0 NOT NULL,
end_date int DEFAULT 0 NOT NULL,
rep_opt varchar(32) DEFAULT '' NOT NULL,
- room_id int DEFAULT 1 NOT NULL,
timestamp timestamp DEFAULT current_timestamp,
create_by varchar(80) DEFAULT '' NOT NULL,
name varchar(80) DEFAULT '' NOT NULL,
@@ -178,6 +176,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '36');
+ VALUES ('db_version', '37');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/branches/linked_bookings/tables.pg.sql
===================================================================
--- mrbs/branches/linked_bookings/tables.pg.sql 2012-12-29 20:46:42 UTC (rev
2625)
+++ mrbs/branches/linked_bookings/tables.pg.sql 2012-12-29 21:06:22 UTC (rev
2626)
@@ -94,7 +94,6 @@
end_time int DEFAULT 0 NOT NULL,
entry_type int DEFAULT 0 NOT NULL,
repeat_id int DEFAULT 0 NOT NULL,
- room_id int DEFAULT 1 NOT NULL,
timestamp timestamp DEFAULT current_timestamp,
create_by varchar(80) NOT NULL,
name varchar(80) NOT NULL,
@@ -133,7 +132,6 @@
rep_type int DEFAULT 0 NOT NULL,
end_date int DEFAULT 0 NOT NULL,
rep_opt varchar(32) NOT NULL,
- room_id int DEFAULT 1 NOT NULL,
timestamp timestamp DEFAULT current_timestamp,
create_by varchar(80) NOT NULL,
name varchar(80) NOT NULL,
@@ -191,6 +189,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '36');
+ VALUES ('db_version', '37');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/branches/linked_bookings/web/dbsys.inc
===================================================================
--- mrbs/branches/linked_bookings/web/dbsys.inc 2012-12-29 20:46:42 UTC (rev
2625)
+++ mrbs/branches/linked_bookings/web/dbsys.inc 2012-12-29 21:06:22 UTC (rev
2626)
@@ -18,7 +18,7 @@
$tbl_zoneinfo = $db_tbl_prefix . "zoneinfo";
-$db_schema_version = 36;
+$db_schema_version = 37;
$local_db_schema_version = 1;
Added: mrbs/branches/linked_bookings/web/upgrade/37/mysql.sql
===================================================================
--- mrbs/branches/linked_bookings/web/upgrade/37/mysql.sql
(rev 0)
+++ mrbs/branches/linked_bookings/web/upgrade/37/mysql.sql 2012-12-29
21:06:22 UTC (rev 2626)
@@ -0,0 +1,10 @@
+# $Id$
+
+# Remove the room_id columns as they are no longer needed
+# (the room_id is now held in the junction tables)
+
+ALTER TABLE %DB_TBL_PREFIX%entry
+DROP COLUMN room_id;
+
+ALTER TABLE %DB_TBL_PREFIX%repeat
+DROP COLUMN room_id;
Property changes on: mrbs/branches/linked_bookings/web/upgrade/37/mysql.sql
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: mrbs/branches/linked_bookings/web/upgrade/37/pgsql.sql
===================================================================
--- mrbs/branches/linked_bookings/web/upgrade/37/pgsql.sql
(rev 0)
+++ mrbs/branches/linked_bookings/web/upgrade/37/pgsql.sql 2012-12-29
21:06:22 UTC (rev 2626)
@@ -0,0 +1,10 @@
+-- $Id$
+
+-- Remove the room_id columns as they are no longer needed
+-- (the room_id is now held in the junction tables)
+
+ALTER TABLE %DB_TBL_PREFIX%entry
+DROP COLUMN room_id;
+
+ALTER TABLE %DB_TBL_PREFIX%repeat
+DROP COLUMN room_id;
Property changes on: mrbs/branches/linked_bookings/web/upgrade/37/pgsql.sql
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
