From 95f931bcb709f7077b9184eeba1ba5d1dcd51daa Mon Sep 17 00:00:00 2001 From: geoffhumphrey <507357@den-e88543m.la.frd.directv.com> Date: Tue, 28 Jun 2016 10:42:20 -0600 Subject: [PATCH] Prep for 2.1.4 Release; Bug Fix for Issue #628 --- admin/competition_info.admin.php | 5 +- includes/current_version.inc.php | 4 +- sql/bcoem_baseline_2.1.X.sql | 119 +------------------------------ update/1.3.2.0_update.php | 80 ++++++++++++--------- 4 files changed, 55 insertions(+), 153 deletions(-) diff --git a/admin/competition_info.admin.php b/admin/competition_info.admin.php index 6c99102f..3b0d4dc3 100644 --- a/admin/competition_info.admin.php +++ b/admin/competition_info.admin.php @@ -292,9 +292,8 @@

Each entry will consist of 12 to 22 ounce capped bottles or corked bottles that are void of all identifying information, including labels and embossing. Printed caps are allowed, but must be blacked out completely.

12oz brown glass bottles are preferred; however, green and clear glass will be accepted. Swing top bottles will likewise be accepted as well as corked bottles.

Bottles will not be returned to contest entrants.

-

Completed entry forms and recipe sheets must be submitted with all entries, and can be printed directly from this website. Entry forms should be attached to bottle labels by the method specified on the bottle label.

-

Please fill out the entry forms completely. Be meticulous about noting any special ingredients that must be specified. Failure to note such ingredients may impact the judges' scoring of your entry.

-

Brewers are not limited to one entry in each category but may only enter each subcategory once.

+

All requisite paperwork must be submitted with each entry and can be printed directly from this website. Entry paperwork should be attached to bottles by the method specified on the bottle label.

+

Be meticulous about noting any special ingredients that must be specified. Failure to note such ingredients may impact the judges' scoring of your entry.

Indicate the number of bottles, size, color, etc. Edit default text as needed. diff --git a/includes/current_version.inc.php b/includes/current_version.inc.php index eab91115..38e7329a 100644 --- a/includes/current_version.inc.php +++ b/includes/current_version.inc.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/sql/bcoem_baseline_2.1.X.sql b/sql/bcoem_baseline_2.1.X.sql index f5152ddf..e923d976 100644 --- a/sql/bcoem_baseline_2.1.X.sql +++ b/sql/bcoem_baseline_2.1.X.sql @@ -5,7 +5,7 @@ -- -- ------------------------------------------------------------------------------------ -- --- UPDATED 05.31.2016 for Version 2.1.3.0 +-- UPDATED 06.29.2016 for Version 2.1.4.0 -- -- ------------------------------------------------------------------------------------ -- @@ -1186,7 +1186,7 @@ CREATE TABLE IF NOT EXISTS `baseline_system` ( -- INSERT INTO `baseline_system` (`id`, `version`, `version_date`, `data_check`, `setup`) VALUES -(1, '2.1.3.0', '2016-05-31', '2016-05-31 11:00:01', 1); +(1, '2.1.4.0', '2016-06-30', '2016-06-30 11:00:01', 1); -- -------------------------------------------------------- @@ -1353,121 +1353,8 @@ ALTER TABLE `baseline_system` -- ALTER TABLE `baseline_users` ADD PRIMARY KEY (`id`); + --- --- AUTO_INCREMENT for dumped tables --- - --- --- AUTO_INCREMENT for table `baseline_archive` --- -ALTER TABLE `baseline_archive` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_brewer` --- -ALTER TABLE `baseline_brewer` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_brewing` --- -ALTER TABLE `baseline_brewing` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_contacts` --- -ALTER TABLE `baseline_contacts` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_drop_off` --- -ALTER TABLE `baseline_drop_off` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_judging_assignments` --- -ALTER TABLE `baseline_judging_assignments` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_judging_flights` --- -ALTER TABLE `baseline_judging_flights` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_judging_locations` --- -ALTER TABLE `baseline_judging_locations` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_judging_preferences` --- -ALTER TABLE `baseline_judging_preferences` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_judging_scores` --- -ALTER TABLE `baseline_judging_scores` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_judging_scores_bos` --- -ALTER TABLE `baseline_judging_scores_bos` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_judging_tables` --- -ALTER TABLE `baseline_judging_tables` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_mods` --- -ALTER TABLE `baseline_mods` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_preferences` --- -ALTER TABLE `baseline_preferences` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_special_best_data` --- -ALTER TABLE `baseline_special_best_data` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_special_best_info` --- -ALTER TABLE `baseline_special_best_info` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_sponsors` --- -ALTER TABLE `baseline_sponsors` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_staff` --- -ALTER TABLE `baseline_staff` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; --- --- AUTO_INCREMENT for table `baseline_styles` --- -ALTER TABLE `baseline_styles` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=227; --- --- AUTO_INCREMENT for table `baseline_style_types` --- -ALTER TABLE `baseline_style_types` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=4; --- --- AUTO_INCREMENT for table `baseline_system` --- -ALTER TABLE `baseline_system` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; --- --- AUTO_INCREMENT for table `baseline_users` --- -ALTER TABLE `baseline_users` - MODIFY `id` int(8) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=2; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/update/1.3.2.0_update.php b/update/1.3.2.0_update.php index 891fb333..1392df5b 100644 --- a/update/1.3.2.0_update.php +++ b/update/1.3.2.0_update.php @@ -12,15 +12,19 @@ // Adding style set preferences // ----------------------------------------------------------- -$updateSQL = "ALTER TABLE `".$prefix."preferences` ADD `prefsStyleSet` VARCHAR( 20 ) NULL"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("prefsStyleSet",$prefix."preferences")) { + $updateSQL = "ALTER TABLE `".$prefix."preferences` ADD `prefsStyleSet` VARCHAR( 20 ) NULL"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."preferences` ADD `prefsAutoPurge` TINYINT( 1 ) NULL"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("prefsAutoPurge",$prefix."preferences")) { + $updateSQL = "ALTER TABLE `".$prefix."preferences` ADD `prefsAutoPurge` TINYINT( 1 ) NULL"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} $output .= "
  • Preferences table altered successfully.
    • "; @@ -31,35 +35,47 @@ // shift carbonation, sweetnes, and strength to DB side // ----------------------------------------------------------- -$updateSQL = "ALTER TABLE `".$prefix."styles` CHANGE `brewStyleJudgingLoc` `brewStyleVersion` VARCHAR(20) NULL DEFAULT NULL;"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (check_update("brewStyleJudgingLoc",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` CHANGE `brewStyleJudgingLoc` `brewStyleVersion` VARCHAR(20) NULL DEFAULT NULL;"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleStrength` INT(1) NULL COMMENT 'Requires strength? 0=No, 1=Yes';"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("brewStyleStrength",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleStrength` INT(1) NULL COMMENT 'Requires strength? 0=No, 1=Yes';"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleCarb` INT(1) NULL COMMENT 'Requires carbonation? 0=No, 1=Yes';"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("brewStyleCarb",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleCarb` INT(1) NULL COMMENT 'Requires carbonation? 0=No, 1=Yes';"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleSweet` INT(1) NULL COMMENT 'Requires sweetness? 0=No, 1=Yes';"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("brewStyleSweet",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleSweet` INT(1) NULL COMMENT 'Requires sweetness? 0=No, 1=Yes';"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleCategory` VARCHAR(255) NULL DEFAULT NULL AFTER `brewStyle`;"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("brewStyleCategory",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleCategory` VARCHAR(255) NULL DEFAULT NULL AFTER `brewStyle`;"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} -$updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleTags` VARCHAR(255) NULL DEFAULT NULL"; -mysqli_select_db($connection,$database); -mysqli_real_escape_string($connection,$updateSQL); -$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +if (!check_update("brewStyleTags",$prefix."styles")) { + $updateSQL = "ALTER TABLE `".$prefix."styles` ADD `brewStyleTags` VARCHAR(255) NULL DEFAULT NULL"; + mysqli_select_db($connection,$database); + mysqli_real_escape_string($connection,$updateSQL); + $result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection)); +} //if (check_db_table_column("preferences","prefsStyleSet")) $output .= "
  • Styles table altered successfully.
    • ";