X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=UpdateDatabase%2FMysqlLinks.php;h=02db5481d7a7dca3fb27cba0a97106717adace5a;hb=3dfa28ee12e72e27f69a7734bef807c2628e5d53;hp=86a93c28aaa4f30c245c96d6d40feb4e250b6382;hpb=e90b0afb40a7b13ab7f4a758490b80c237bdc73b;p=Pman.Core

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 86a93c28..02db5481 100644
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -40,7 +40,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
     
     var $dburl;
     var $schema;
-    var $links;
+    var $links = array();
     
     function __construct()
     {
@@ -49,15 +49,20 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         $this->updateTableComments();
        
         $ff = HTML_FlexyFramework::get();
-        if (!empty($ff->Pman['enable_trigger_tests'])) {
+        if (empty($ff->Pman['enable_trigger_tests'])) {
+            return;
+        }
+        if (!empty($ff->page->opts['disable-create-triggers'])) {
+            return;
+        }
             
             // note we may want to override some of these... - to do special triggers..
             // as you can only have one trigger per table for each action.
             
-            $this->createDeleteTriggers();
-            $this->createInsertTriggers();
-            $this->createUpdateTriggers();
-        }
+        $this->createDeleteTriggers();
+        $this->createInsertTriggers();
+        $this->createUpdateTriggers();
+        
         
         
     }
@@ -73,12 +78,43 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         $dbini = 'ini_'. basename($this->dburl['path']);
         
         
-        $iniCache = $ff->DB_DataObject[$dbini];
+        $iniCache = isset( $ff->PDO_DataObject) ?  $ff->PDO_DataObject['schema_location'] : $ff->DB_DataObject[$dbini];
         
+        if (strpos($iniCache, DIRECTORY_SEPARATOR) !== false) {
+            echo "SKIP links code - cached ini file has not been created\n";
+            return;
+        }
         $this->schema = parse_ini_file($iniCache, true);
         $this->links = parse_ini_file(preg_replace('/\.ini$/', '.links.ini', $iniCache), true);
         
-
+        $lcfg = &$this->links;
+        $cfg = empty($ff->DB_DataObject) ? array() : $ff->DB_DataObject;
+        
+        if (!empty($cfg['table_alias'])) {
+            $ta = $cfg['table_alias'];
+            foreach($lcfg  as $k=>$v) {
+                $kk = $k;
+                if (isset($ta[$k])) {
+                    $kk = $ta[$k];
+                    if (!isset($lcfg[$kk])) {
+                        $lcfg[$kk] = array();
+                    }
+                }
+                foreach($v as $l => $t_c) {
+                    $bits = explode(':',$t_c);
+                    $tt = isset($ta[$bits[0]]) ? $ta[$bits[0]] : $bits[0];
+                    if ($tt == $bits[0] && $kk == $k) {
+                        continue;
+                    }
+                    
+                    $lcfg[$kk][$l] = $tt .':'. $bits[1];
+                    
+                    
+                }
+                
+            }
+        }
+         
         
     }
     function updateTableComments()
@@ -107,7 +143,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                     FROM
                         information_schema.TABLES
                     WHERE
-                        TABLE_SCHEMA = '{$q->escape($q->database())}'
+                        TABLE_SCHEMA = DATABASE()
                         AND
                         TABLE_NAME = '{$q->escape($tbl)}'
         ");
@@ -263,10 +299,11 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                
             ";
             $has_checks=  false;
-            
+            $errs = array();
             foreach($map as $source_col=>$target) {
                 // check that source_col exists in schema.
                 if (!isset($this->schema[$tbl][$source_col])) {
+                    $errs[] = "SOURCE MISSING: $source_col => $target";
                     continue;
                 }
                 
@@ -276,6 +313,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 
                 if (!isset($this->schema[$target_table])) {
                     // skip... target table does not exist
+                    $errs[] = "TARGET MISSING: $source_col => $target";
                     continue;
                 }
                 
@@ -311,8 +349,8 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
             ";
             
             if (!$has_checks) {
-                echo "SKIP TRIGGER {$tbl}_before_insert (missing " . implode($errs) . ")\n";
-                return;
+                echo "SKIP TRIGGER {$tbl}_before_insert (missing " . implode(", ", $errs) . ")\n";
+                continue;
             }
             //echo $trigger; exit;
             //DB_DAtaObject::debugLevel(1);
@@ -354,11 +392,11 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                
             ";
             $has_checks=  false;
-            $err[] = array();
+            $errs = array();
             foreach($map as $source_col=>$target) {
                 // check that source_col exists in schema.
                 if (!isset($this->schema[$tbl][$source_col])) {
-                    $err[] = "SOURCE MISSING: $source_col => $target";
+                    $errs[] = "SOURCE MISSING: $source_col => $target";
                     continue;
                 }
                 
@@ -368,7 +406,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                 
                 if (!isset($this->schema[$target_table])) {
                     // skip... target table does not exist
-                    $err[] = "TARGET MISSING: $source_col => $target";
+                    $errs[] = "TARGET MISSING: $source_col => $target";
                     continue;
                 }
                 
@@ -399,8 +437,8 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
            
             ";
             if (!$has_checks) {
-                echo "SKIP TRIGGER {$tbl}_before_update (missing " . implode($errs) . ")\n";
-                return;
+                echo "SKIP TRIGGER {$tbl}_before_update (missing " . implode(", ", $errs) . ")\n";
+                continue;
             }
             
             //echo $trigger; exit;
@@ -410,11 +448,6 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
             echo "CREATED TRIGGER {$tbl}_before_update\n";
             
             
-            
-            
-            
-            
-            
         }