DataObjects/pman.links.ini

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 07e5b74..11b0cd2 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -61,6 +61,12 @@ class Pman_Core_UpdateDatabase extends Pman
             'min' => 1,
             'max' => 1,
         ),
+        'skip-mysql-checks' => array(
+            'desc' => 'Skip mysql checks',
+            'default' => '',
+            'min' => 1,
+            'max' => 1,
+        ),
         'procedures-only' => array(
             'desc' => 'Only import procedures (not supported by most modules yet) - ignores sql directory',
             'default' => '',
@@ -182,7 +188,6 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->runUpdateModulesData();
         
-        
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
             // make sure we have a good cache...?
            
@@ -677,7 +682,7 @@ class Pman_Core_UpdateDatabase extends Pman
             echo "$module\n";
             $x->updateData();
         }
-                
+        
     }
     
     
@@ -907,13 +912,18 @@ class Pman_Core_UpdateDatabase extends Pman
         if ($done_check) {
             return;
         }
+        
+        
+        if (!empty($this->opts['skip-mysql-checks'])) {
+            return;
+        }
         // innodb in single files is far more efficient that MYD or one big innodb file.
         // first check if database is using this format.
         $db = DB_DataObject::factory('core_enum');
         $db->query("show variables like 'innodb_file_per_table'");
         $db->fetch();
         if ($db->Value == 'OFF') {
-            die("Error: set innodb_file_per_table = 1 in my.cnf\n\n");
+            die("Error: set innodb_file_per_table = 1 in my.cnf (or run with --skip-mysql-checks\n\n");
         }
         
         $db = DB_DataObject::factory('core_enum');
@@ -1128,9 +1138,10 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function generateDataobjectsCache()
     {
-        $url = "http://localhost{$this->local_base_url}/Roo/Core/RefreshDatabaseCache";
+        $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache";
             
         $this->curl($url);
+        
     }
     
     function curl($url, $request = array(), $method = 'GET') 
@@ -1157,7 +1168,7 @@ class Pman_Core_UpdateDatabase extends Pman
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         
         curl_setopt($ch, CURLOPT_HEADER, false);
-        curl_setopt($ch, CURLOPT_VERBOSE, 1);
+        curl_setopt($ch, CURLOPT_VERBOSE, 0);
         curl_setopt($ch, CURLOPT_TIMEOUT, 30);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);