drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

tidy up and variety validation work

Browse Source
This commit is contained in:
Nathan Coad
2018-05-03 08:09:29 +10:00
parent 145e914f5e
commit 8b133cf160
7 changed files with 1008 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
booking.install
View File

@@ -93,7 +93,7 @@ function booking_update_7201() {
* Add table for variety sessions
*/
function booking_update_7202() {
$booking_variety_options = array(
$booking_variety_sessions = array(
'fields' => array(
'vid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_eventid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
@@ -105,7 +105,7 @@ function booking_update_7202() {
),
'primary key' => array('vid'),
);
$booking_variety_times = array(
$booking_variety_timeslots = array(
'fields' => array(
'tid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_eventid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
@@ -127,8 +127,8 @@ function booking_update_7202() {
);
db_create_table('booking_variety_options', $booking_variety_options);
db_create_table('booking_variety_times', $booking_variety_times);
db_create_table('booking_variety_sessions', $booking_variety_sessions);
db_create_table('booking_variety_timeslots', $booking_variety_timeslots);
db_create_table('booking_variety_regn', $booking_variety_regn);
//TODO: create tables for variety session timeslots and variety session registrations (map user to variety session id)
@@ -781,6 +781,17 @@ function booking_update_7253() {
_booking_node_create_mysqlview();
}
/**
* Change booking_variety_regn field type and rename some tables
*/
function booking_update_7254() {
$spec = array('type' => 'varchar', 'length' => '1000', 'not null' => FALSE);
db_change_field('booking_variety_regn', 'booking_variety_id', 'booking_variety_ids', $spec);
db_rename_table('booking_variety_times', 'booking_variety_timeslots');
db_rename_table('booking_variety_options', 'booking_variety_sessions');
}
/**
* Implementation of hook_install().
*/
@@ -1047,7 +1058,7 @@ function booking_schema() {
'primary key' => array('payid'),
);
$schema['booking_variety_options'] = array(
$schema['booking_variety_sessions'] = array(
'fields' => array(
'vid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_eventid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
@@ -1060,7 +1071,7 @@ function booking_schema() {
'primary key' => array('vid'),
);
$schema['booking_variety_times'] = array(
$schema['booking_variety_timeslots'] = array(
'fields' => array(
'tid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_eventid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
@@ -1075,7 +1086,7 @@ function booking_schema() {
$schema['booking_variety_regn'] = array(
'fields' => array(
'rid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_variety_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_variety_ids' => array('type' => 'varchar', 'length' => '1000', 'not null' => TRUE),
'booking_node_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
),
'primary key' => array('rid'),