From 948d14e35adc5183db7b62b449e5e40f17042a04 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Thu, 11 Jul 2013 21:15:00 -0700
Subject: [PATCH] Branched 4.1.2-dev to prepare for release of OpenEMR 4.1.2 in
 several weeks

---
 sql/4_1_2-to-4_1_3_upgrade.sql | 59 ++++++++++++++++++++++++++++++++++++++++++
 sql_upgrade.php                |  4 +--
 version.php                    |  2 +-
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 sql/4_1_2-to-4_1_3_upgrade.sql

diff --git a/sql/4_1_2-to-4_1_3_upgrade.sql b/sql/4_1_2-to-4_1_3_upgrade.sql
new file mode 100644
index 000000000..741eb632a
--- /dev/null
+++ b/sql/4_1_2-to-4_1_3_upgrade.sql
@@ -0,0 +1,59 @@
+--
+--  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
+
+--  #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.
+
+--  #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.
+
diff --git a/sql_upgrade.php b/sql_upgrade.php
index ae7799a07..07c6c28ab 100644
--- a/sql_upgrade.php
+++ b/sql_upgrade.php
@@ -97,8 +97,8 @@ if (!empty($_POST['form_submit'])) {
 <?php
 foreach ($versions as $version => $filename) {
   echo " <option value='$version'";
-  // Defaulting to most recent version, which is now 4.1.1.
-  if ($version === '4.1.1') echo " selected";
+  // Defaulting to most recent version, which is now 4.1.2.
+  if ($version === '4.1.2') echo " selected";
   echo ">$version</option>\n";
 }
 ?>
diff --git a/version.php b/version.php
index 7176eda89..2c9c325bc 100644
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // upgrade file is the starting point for the next upgrade.
 $v_major = '4';
 $v_minor = '1';
-$v_patch = '2';
+$v_patch = '3';
 $v_tag   = '-dev'; // minor revision number, should be empty for production releases
 
 // A real patch identifier. This is incremented when release a patch for a
-- 
2.11.4.GIT