projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
looking for wrong seperator
[Pman.Core]
/
DatabaseColumns.php
diff --git
a/DatabaseColumns.php
b/DatabaseColumns.php
index
66cf4ec
..
fd674a3
100644
(file)
--- a/
DatabaseColumns.php
+++ b/
DatabaseColumns.php
@@
-22,7
+22,7
@@
class Pman_Core_DatabaseColumns extends Pman {
return true;
}
return true;
}
- function get($table) {
+ function get($table
, $opts = Array()
) {
$d = DB_DAtaObject::Factory($table);
if (method_exists($d, 'availableColumns')) {
$cols = $d->availableColumns();
$d = DB_DAtaObject::Factory($table);
if (method_exists($d, 'availableColumns')) {
$cols = $d->availableColumns();
@@
-34,6
+34,7
@@
class Pman_Core_DatabaseColumns extends Pman {
$types = array();
$types = array();
+ $tables = array();
$schemas = array($table => $d->table());
foreach($cols as $name=>$table_col) {
$schemas = array($table => $d->table());
foreach($cols as $name=>$table_col) {
@@
-42,8
+43,7
@@
class Pman_Core_DatabaseColumns extends Pman {
$schemas[$tbl] = DB_DataObject::Factory($tbl)->table();
}
$types[$name] = $schemas[$tbl][$col];
$schemas[$tbl] = DB_DataObject::Factory($tbl)->table();
}
$types[$name] = $schemas[$tbl][$col];
-
-
+ $tables[$name] = $tbl;
}
foreach($re['join_names'] as $c=>$f) {
}
foreach($re['join_names'] as $c=>$f) {
@@
-58,7
+58,8
@@
class Pman_Core_DatabaseColumns extends Pman {
$ret[] = array(
'name' => $c,
'val' => $f,
$ret[] = array(
'name' => $c,
'val' => $f,
- 'type' => isset($types[$c]) ? $types[$c] : -1,
+ 'type' => isset($types[$c]) ? $this->typeToName($types[$c]) : -1,
+ 'table' => isset($tables[$c]) ? $tables[$c] : "",
);
}
);
}