X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DatabaseColumns.php;h=fd674a3082a9ec51abda4197ca25a4504c698110;hp=05139ec97d269e96287268d5448a1145656d606d;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=171f9d2100938d19540a4474b70ce1c5acc3149e

diff --git a/DatabaseColumns.php b/DatabaseColumns.php
index 05139ec9..fd674a30 100644
--- a/DatabaseColumns.php
+++ b/DatabaseColumns.php
@@ -22,20 +22,65 @@ class Pman_Core_DatabaseColumns extends Pman {
         return true;
     }
     
-    function get($table) {
+    function get($table, $opts = Array()) {
         $d = DB_DAtaObject::Factory($table);
-        $re = $d->autoJoin();
-        echo '<PRE>';print_r($re);
-        $ret = array ();
-        foreach($re['cols'] as $c=>$f) {
+        if (method_exists($d, 'availableColumns')) {
+            $cols = $d->availableColumns();
+        } else {
+            
+            $re = $d->autoJoin();
+            //echo '<PRE>';print_r($re);
+            $cols = $re['cols'] ;
+            
+            
+            $types = array();
+            $tables = array();
+            $schemas = array($table => $d->table());
+            
+            foreach($cols as $name=>$table_col) {
+                list($tbl, $col) = explode('.', $table_col);
+                if (!isset($schemas[$tbl])) {
+                    $schemas[$tbl] = DB_DataObject::Factory($tbl)->table();
+                }
+                $types[$name] = $schemas[$tbl][$col];
+                $tables[$name] = $tbl;
+            }
+             
+            foreach($re['join_names'] as $c=>$f) {
+                $cols[$c] = $f;
+            }
+            
+        }
+        
+        
+        
+        foreach($cols as $c=>$f) {
             $ret[]  = array(
                 'name' => $c,
-                'val' => $f
+                'val' => $f,
+                'type' => isset($types[$c]) ? $this->typeToName($types[$c]) : -1,
+                'table' => isset($tables[$c]) ? $tables[$c] : "",
             );
             
         }
-        $this->jdata($ret);
         
+        $this->jdata($ret);
+    }
+    
+    function typeToName($t)
+    {
+        switch(true) {
+            case ($t & 64): return 'text';
+            case ($t & 32): return 'text';
+            case ($t & 4 && $t & 8): return 'datetime';
+            case ($t & 4): return 'date';
+            case ($t & 8): return 'time';
+            case ($t & 16): return 'bool';
+            case ($t & 2): return 'varchar';
+            case ($t & 1): return 'number';
+                
+        }
+        return '??';
         
     }
-}
\ No newline at end of file
+}