Shift upgrade code to 4.7.12 and re run regen.sh

CRM/Core/DAO/AllCoreTables.data.php

@@ -24,7 +24,7 @@
 | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
 +--------------------------------------------------------------------+
 */
-// (GenCodeChecksum:cca4e9b2d8c7de618449cc2fce53bc7c)
+// (GenCodeChecksum:34170ee0f91484a207dc1ebaa2f71a09)
 return array(
   'CRM_Core_DAO_AddressFormat' => array(
     'name' => 'AddressFormat',

CRM/Core/DAO/OptionGroup.php

@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d40138ee472e300ad58c19b283f1b585)
+ * (GenCodeChecksum:5b506b744806a9089160f2f99714a26a)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -72,6 +72,12 @@ class CRM_Core_DAO_OptionGroup extends CRM_Core_DAO {
    * @var string
    */
   public $description;
+  /**
+   * Option group description.
+   *
+   * @var string
+   */
+  public $data_type;
   /**
    * Is this a predefined system option group (i.e. it can not be deleted)?
    *
@@ -139,6 +145,17 @@ static function &fields() {
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
         ) ,
+        'data_type' => array(
+          'name' => 'data_type',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('Data Type for this option group') ,
+          'description' => 'Option group description.',
+          'maxlength' => 128,
+          'size' => CRM_Utils_Type::HUGE,
+          'pseudoconstant' => array(
+            'callback' => 'CRM_Utils_Type::dataTypes',
+          )
+        ) ,
         'is_reserved' => array(
           'name' => 'is_reserved',
           'type' => CRM_Utils_Type::T_BOOLEAN,

CRM/Upgrade/Incremental/php/FourSeven.php

@@ -222,7 +222,6 @@ public function upgrade_4_7_10($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     $this->addTask(ts('Upgrade Add Help Pre and Post Fields to price value table'), 'addHelpPreAndHelpPostFieldsPriceFieldValue');
     $this->addTask(ts('Alter index and type for image URL'), 'alterIndexAndTypeForImageURL');
-    $this->addTask(ts('Add Data Type column to civicrm_option_group'), 'addDataTypeColumnToOptionGroupTable');
   }
 
   /**
@@ -235,6 +234,16 @@ public function upgrade_4_7_11($rev) {
     $this->addTask('Dashboard schema updates', 'dashboardSchemaUpdate');
   }
 
+  /**
+   * Upgrade function.
+   *
+   * @param string $rev
+   */
+  public function upgrade_4_7_12($rev) {
+    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+    $this->addTask(ts('Add Data Type column to civicrm_option_group'), 'addDataTypeColumnToOptionGroupTable');
+  }
+
   /*
    * Important! All upgrade functions MUST call the 'runSql' task.
    * Uncomment and use the following template for a new upgrade version