php7 fixes

[Pman.Builder] / ERM.php

diff --git a/ERM.php b/ERM.php
index f5feb6c..2f90bf6 100644 (file)
--- a/ERM.php
+++ b/ERM.php
@@ -17,7 +17,7 @@ class Pman_Builder_ERM extends Pman
         
        }
     
-    function get($tbl)
+    function get($tbl, $opts = array())
     {
         
         
@@ -98,7 +98,7 @@ class Pman_Builder_ERM extends Pman
             // colname_{remotename}_{col}
             $kv = explode(':', $links[$c]);
             //$ar = $this->createRet($dos[$c], $c . '_' . $kv[1] . '_');
-            $ar = $this->createRet($dos[$c], $c . '_' );
+            $ar = $this->createRet($dos[$c], $c . '_' , $kv[1]);
             $desc[$c]['maps_to'] = $kv[1];
             $desc[$c]['deps'] = array_values($ar);
             
@@ -117,14 +117,24 @@ class Pman_Builder_ERM extends Pman
         
         
     }
-    function createRet($do, $pref='')
+    function createRet($do, $pref='', $skip = '')
     {
-        static  $cache = array();
+        static  $desc = array();
         static  $types= array();
         $tn = $do->tableName();
 
+
+
+
+
         // get a description if available..
         if (!isset($desc[$tn])) {
+            
+            
+            
+            
+            
+            
             $desc[$tn] = array();
             $dd = clone($do);
             
@@ -139,7 +149,7 @@ class Pman_Builder_ERM extends Pman
                     c.table_schema = 'public' and c.table_name = '{$tn}'
             ");
             while($dd->fetch()) {
-                $cache[$tn][$dd->name] = $dd->desc;
+                $desc[$tn][$dd->name] = $dd->desc;
             }
             
             $defs =  $dd->getDatabaseConnection()->tableInfo($tn);
@@ -155,6 +165,9 @@ class Pman_Builder_ERM extends Pman
        
         $ret = array();
         foreach($do->table() as $k=>$ty) {
+            if ($k == $skip) {
+                continue;
+            }
             $ret[$k] = array(
                 'table' => $tn,
                 'column' => $pref . $k,