DataObjects/Core_enum.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 86cada2..bbc428c 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -171,7 +171,7 @@ class Pman_Core_UpdateDatabase extends Pman
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
             // make sure we have a good cache...?
            
-            DB_DataObject::factory('companies')->initCompanies($this, $opts);
+            DB_DataObject::factory('core_company')->initCompanies($this, $opts);
         }
         
         $this->runExtensions();
@@ -719,7 +719,7 @@ class Pman_Core_UpdateDatabase extends Pman
     function updateDataGroups()
     {
          
-        $groups = DB_DataObject::factory('groups');
+        $groups = DB_DataObject::factory('core_group');
         $groups->initGroups();
         
         $groups->initDatabase($this,array(
@@ -743,7 +743,7 @@ class Pman_Core_UpdateDatabase extends Pman
     {
          
         // fix comptypes enums..
-        $c = DB_DataObject::Factory('Companies');
+        $c = DB_DataObject::Factory('core_company');
         $c->selectAdd();
         $c->selectAdd('distinct(comptype) as comptype');
         $c->whereAdd("comptype != ''");
@@ -761,11 +761,11 @@ class Pman_Core_UpdateDatabase extends Pman
         $c->initEnums($ctb);
         //DB_DataObject::debugLevel(1);
         // fix comptypeid
-        $c = DB_DataObject::Factory('Companies');
+        $c = DB_DataObject::Factory('core_company');
         $c->query("
-            UPDATE Companies 
+            UPDATE {$c->tableName()} 
                 SET
-                    comptype_id = (SELECT id FROM core_enum where etype='comptype' and name=Companies.comptype LIMIT 1)
+                    comptype_id = (SELECT id FROM core_enum where etype='comptype' and name={$c->tableName()}.comptype LIMIT 1)
                 WHERE
                     comptype_id = 0
                     AND
@@ -792,7 +792,7 @@ class Pman_Core_UpdateDatabase extends Pman
                 if (empty($data['bcc_group'])) {
                     $this->jerr("missing bcc_group for template $name");
                 }
-                $g = DB_DataObject::Factory('Groups')->lookup('name',$data['bcc_group']);
+                $g = DB_DataObject::Factory('core_group')->lookup('name',$data['bcc_group']);
                 
                 if (empty($g->id)) {
                     $this->jerr("bcc_group {$data['bcc_group']} does not exist when importing template $name");
@@ -904,7 +904,7 @@ class Pman_Core_UpdateDatabase extends Pman
                     in_array('STRICT_TRANS_TABLES', $modes) || 
                     !in_array('ALLOW_INVALID_DATES', $modes)
             ){
-                die("Error: set sql_mode include 'ALLOW_INVALID_DATES', remove 'NO_ZERO_IN_DATE' AND 'NO_ZERO_DATE' in my.cnf\n\n");
+                die("Error: set sql_mode include 'ALLOW_INVALID_DATES', remove 'NO_ZERO_IN_DATE' AND 'STRICT_TRANS_TABLES' AND 'NO_ZERO_DATE' in my.cnf\n\n");
             }
         }