From 5ba45f6166d3d4383057d0f24c1641663a4380f1 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Wed, 18 May 2016 01:24:48 -0700
Subject: [PATCH] Updated sql upgrade script to make upgrade more clear fro
 4.2.2

---
 sql/4_2_2-to-4_3_1_upgrade.sql | 74 ----------------------------------
 sql_upgrade.php                |  4 +-
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 sql/4_2_2-to-4_3_1_upgrade.sql

diff --git a/sql/4_2_2-to-4_3_1_upgrade.sql b/sql/4_2_2-to-4_3_1_upgrade.sql
deleted file mode 100644
index b135c3b7ae4..00000000000
--- a/sql/4_2_2-to-4_3_1_upgrade.sql
+++ /dev/null
@@ -1,74 +0,0 @@
---
---  Comment Meta Language Constructs:
---
---  #IfNotTable
---    argument: table_name
---    behavior: if the table_name does not exist,  the block will be executed
-
---  #IfTable
---    argument: table_name
---    behavior: if the table_name does exist, the block will be executed
-
---  #IfColumn
---    arguments: table_name colname
---    behavior:  if the table and column exist,  the block will be executed
-
---  #IfMissingColumn
---    arguments: table_name colname
---    behavior:  if the table exists but the column does not,  the block will be executed
-
---  #IfNotColumnType
---    arguments: table_name colname value
---    behavior:  If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
-
---  #IfNotRow
---    arguments: table_name colname value
---    behavior:  If the table table_name does not have a row where colname = value, the block will be executed.
-
---  #IfNotRow2D
---    arguments: table_name colname value colname2 value2
---    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
-
---  #IfNotRow3D
---    arguments: table_name colname value colname2 value2 colname3 value3
---    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
-
---  #IfNotRow4D
---    arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
---    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
-
---  #IfNotRow2Dx2
---    desc:      This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
---    arguments: table_name colname value colname2 value2 colname3 value3
---    behavior:  The block will be executed if both statements below are true:
---               1) The table table_name does not have a row where colname = value AND colname2 = value2.
---               2) The table table_name does not have a row where colname = value AND colname3 = value3.
-
---  #IfRow2D
---    arguments: table_name colname value colname2 value2
---    behavior:  If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
-
---  #IfRow3D
---        arguments: table_name colname value colname2 value2 colname3 value3
---        behavior:  If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
-
---  #IfIndex
---    desc:      This function is most often used for dropping of indexes/keys.
---    arguments: table_name colname
---    behavior:  If the table and index exist the relevant statements are executed, otherwise not.
-
---  #IfNotIndex
---    desc:      This function will allow adding of indexes/keys.
---    arguments: table_name colname
---    behavior:  If the index does not exist, it will be created
-
---  #EndIf
---    all blocks are terminated with a #EndIf statement.
-
---  #IfNotListReaction
---    Custom function for creating Reaction List
-
---  #IfNotListOccupation
---    Custom function for creating Occupation List
-
-
diff --git a/sql_upgrade.php b/sql_upgrade.php
index 9086aab09a4..f2ea49a566a 100644
--- a/sql_upgrade.php
+++ b/sql_upgrade.php
@@ -109,8 +109,8 @@
 <?php
 foreach ($versions as $version => $filename) {
   echo " <option value='$version'";
-  // Defaulting to most recent version, which is now 4.2.2.
-  if ($version === '4.2.2') echo " selected";
+  // Defaulting to most recent version, which is now 4.2.1.
+  if ($version === '4.2.1') echo " selected";
   echo ">$version</option>\n";
 }
 ?>