} else {
$re = $d->autoJoin();
- echo '<PRE>';print_r($re);
+ //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);
}
-}
\ No newline at end of file
+
+ 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 '??';
+
+ }
+}