Revision: 1244
http://mrbs.svn.sourceforge.net/mrbs/?rev=1244&view=rev
Author: cimorrison
Date: 2009-11-09 21:47:09 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
Upgraded database to allow provisional bookings.
Modified Paths:
--------------
mrbs/branches/provisional_bookings/tables.my.sql
mrbs/branches/provisional_bookings/tables.pg.73and_above.sql
mrbs/branches/provisional_bookings/tables.pg.sql
mrbs/branches/provisional_bookings/web/dbsys.inc
mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
Added Paths:
-----------
mrbs/branches/provisional_bookings/web/upgrade/9/
mrbs/branches/provisional_bookings/web/upgrade/9/mysql.sql
mrbs/branches/provisional_bookings/web/upgrade/9/pgsql.sql
Modified: mrbs/branches/provisional_bookings/tables.my.sql
===================================================================
--- mrbs/branches/provisional_bookings/tables.my.sql 2009-11-09 21:27:22 UTC
(rev 1243)
+++ mrbs/branches/provisional_bookings/tables.my.sql 2009-11-09 21:47:09 UTC
(rev 1244)
@@ -59,6 +59,7 @@
type char DEFAULT 'E' NOT NULL,
description text,
private TINYINT(1) NOT NULL DEFAULT 0,
+ status tinyint NOT NULL DEFAULT 1,
PRIMARY KEY (id),
KEY idxStartTime (start_time),
@@ -107,6 +108,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '8');
+ VALUES ( 'db_version', '9');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
Modified: mrbs/branches/provisional_bookings/tables.pg.73and_above.sql
===================================================================
--- mrbs/branches/provisional_bookings/tables.pg.73and_above.sql
2009-11-09 21:27:22 UTC (rev 1243)
+++ mrbs/branches/provisional_bookings/tables.pg.73and_above.sql
2009-11-09 21:47:09 UTC (rev 1244)
@@ -70,7 +70,8 @@
name varchar(80) NOT NULL,
type char DEFAULT 'E' NOT NULL,
description text,
- private smallint DEFAULT 0 NOT NULL
+ private smallint DEFAULT 0 NOT NULL,
+ status smallint DEFAULT 1 NOT NULL
);
create index idxStartTime on mrbs_entry(start_time);
create index idxEndTime on mrbs_entry(end_time);
@@ -111,6 +112,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '8');
+ VALUES ('db_version', '9');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/branches/provisional_bookings/tables.pg.sql
===================================================================
--- mrbs/branches/provisional_bookings/tables.pg.sql 2009-11-09 21:27:22 UTC
(rev 1243)
+++ mrbs/branches/provisional_bookings/tables.pg.sql 2009-11-09 21:47:09 UTC
(rev 1244)
@@ -58,7 +58,8 @@
name varchar(80) DEFAULT '' NOT NULL,
type char DEFAULT 'E' NOT NULL,
description text,
- private smallint DEFAULT 0 NOT NULL
+ private smallint DEFAULT 0 NOT NULL,
+ status smallint DEFAULT 1 NOT NULL
);
create index idxStartTime on mrbs_entry(start_time);
create index idxEndTime on mrbs_entry(end_time);
@@ -99,6 +100,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '7');
+ VALUES ('db_version', '9');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/branches/provisional_bookings/web/dbsys.inc
===================================================================
--- mrbs/branches/provisional_bookings/web/dbsys.inc 2009-11-09 21:27:22 UTC
(rev 1243)
+++ mrbs/branches/provisional_bookings/web/dbsys.inc 2009-11-09 21:47:09 UTC
(rev 1244)
@@ -15,7 +15,7 @@
$tbl_variables = $db_tbl_prefix . "variables";
-$db_schema_version = 8;
+$db_schema_version = 9;
$local_db_schema_version = 1;
Modified: mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
2009-11-09 21:27:22 UTC (rev 1243)
+++ mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
2009-11-09 21:47:09 UTC (rev 1244)
@@ -720,9 +720,20 @@
// Records which DOCTYPE is being used. Do not change - it will not change
the DOCTYPE
// that is used; it is merely used when the code needs to know the DOCTYPE,
for example
// in calls to nl2br. TRUE means XHTML, FALSE means HTML.
- define("IS_XHTML", FALSE);
+ define('IS_XHTML', FALSE);
+
+ /*************************************************
+ * ENTRY STATUS CODES - internal use, do not change
+ **************************************************/
+
+// The booking status codes that are used in the status column in the
+// entry table. Although there are only two codes at the moment, the
+// codes can be added to later if additional status types are required.
+// The default code in the database table is 1, ie a confirmed booking.
+
+define('STATUS_PROVISIONAL', 0);
+define('STATUS_CONFIRMED', 1);
-
/********************************************************
* PHP System Configuration - internal use, do not change
********************************************************/
Added: mrbs/branches/provisional_bookings/web/upgrade/9/mysql.sql
===================================================================
--- mrbs/branches/provisional_bookings/web/upgrade/9/mysql.sql
(rev 0)
+++ mrbs/branches/provisional_bookings/web/upgrade/9/mysql.sql 2009-11-09
21:47:09 UTC (rev 1244)
@@ -0,0 +1,8 @@
+# $Id$
+#
+# Add a column to record entry status code. The default is 1
+# which is a confirmed booking. The status codes are defined
+# in systemdefaults.inc.php
+
+ALTER TABLE %DB_TBL_PREFIX%entry
+ADD COLUMN status tinyint NOT NULL DEFAULT 1;
Property changes on: mrbs/branches/provisional_bookings/web/upgrade/9/mysql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: mrbs/branches/provisional_bookings/web/upgrade/9/pgsql.sql
===================================================================
--- mrbs/branches/provisional_bookings/web/upgrade/9/pgsql.sql
(rev 0)
+++ mrbs/branches/provisional_bookings/web/upgrade/9/pgsql.sql 2009-11-09
21:47:09 UTC (rev 1244)
@@ -0,0 +1,8 @@
+-- $Id$
+--
+-- Add a column to record entry status code. The default is 1
+-- which is a confirmed booking. The status codes are defined
+-- in systemdefaults.inc.php
+
+ALTER TABLE %DB_TBL_PREFIX%entry
+ADD COLUMN status smallint DEFAULT 1 NOT NULL;
Property changes on: mrbs/branches/provisional_bookings/web/upgrade/9/pgsql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
