#285 - added the DEnum::saveIfNew() method and calling it from the Ac…

…tiveRecord providers to save new DEnums for the first time
alphadevx · Aug 17, 2017 · 470d2f1 · 470d2f1
1 parent 4bd701d
commit 470d2f1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/Alpha/Model/ActiveRecordProviderMySQL.php b/Alpha/Model/ActiveRecordProviderMySQL.php
@@ -1274,7 +1274,8 @@ public function makeTable()
                     $sqlQuery = rtrim($sqlQuery, ',');
                     $sqlQuery .= ') CHARACTER SET utf8,';
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INT(11) ZEROFILL,";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INT(11) ZEROFILL UNSIGNED,";
@@ -1352,7 +1353,8 @@ public function makeHistoryTable()
                     $sqlQuery = rtrim($sqlQuery, ',');
                     $sqlQuery .= ') CHARACTER SET utf8,';
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INT(11) ZEROFILL,";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INT(11) ZEROFILL UNSIGNED,";
@@ -1479,7 +1481,8 @@ public function addProperty($propName)
                     $sqlQuery = rtrim($sqlQuery, ',');
                     $sqlQuery .= ') CHARACTER SET utf8';
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INT(11) ZEROFILL";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INT(11) ZEROFILL UNSIGNED";

diff --git a/Alpha/Model/ActiveRecordProviderSQLite.php b/Alpha/Model/ActiveRecordProviderSQLite.php
@@ -1311,7 +1311,8 @@ public function makeTable()
                 } elseif ($prop instanceof Enum) {
                     $sqlQuery .= "$propName TEXT,";
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INTEGER(11),";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INTEGER(11),";
@@ -1406,7 +1407,8 @@ public function makeHistoryTable()
                 } elseif ($prop instanceof Enum) {
                     $sqlQuery .= "$propName TEXT,";
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INTEGER(11),";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INTEGER(11),";
@@ -1529,7 +1531,8 @@ public function addProperty($propName)
                 } elseif ($prop instanceof Enum) {
                     $sqlQuery .= "$propName TEXT";
                 } elseif ($prop instanceof DEnum) {
-                    $tmp = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum = new DEnum(get_class($this->record).'::'.$propName);
+                    $denum->saveIfNew();
                     $sqlQuery .= "$propName INTEGER(11)";
                 } elseif ($prop instanceof Relation) {
                     $sqlQuery .= "$propName INTEGER(11)";

diff --git a/Alpha/Model/Type/DEnum.php b/Alpha/Model/Type/DEnum.php
@@ -137,9 +137,23 @@ public function __construct($name = null)
 
         $this->name = new SmallText($name);
 
-        if (isset($name) && $this->checkTableExists()) {
+        if (isset($name)) {
+            $this->saveIfNew();
+        }
+    }
+
+    /**
+     * Saves a new DEnum record with the same name as this instance if one does not already exist
+     *
+     * @return void
+     *
+     * @since 3.0
+     */
+    public function saveIfNew()
+    {
+        if (isset($this->name) && $this->checkTableExists()) {
             try {
-                $this->loadByAttribute('name', $name);
+                $this->loadByAttribute('name', $this->name);
             } catch (RecordNotFoundException $e) {
                 // DEnum does not exist so create it
                 $this->save();
@@ -189,9 +203,9 @@ public function getOptions($alphaSort = false)
         $count = 0;
         $this->options = array();
 
-        $tmp = new DEnumItem();
+        $item = new DEnumItem();
 
-        foreach ($tmp->loadItems($options->getID()) as $DEnumItem) {
+        foreach ($item->loadItems($options->getID()) as $DEnumItem) {
             $this->options[$DEnumItem->getID()] = $DEnumItem->getValue();
             ++$count;
         }