projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85339d1
)
DatabaseColumns.php
author
Alan Knowles
<alan@roojs.com>
Thu, 22 May 2014 08:43:00 +0000
(16:43 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 22 May 2014 08:43:00 +0000
(16:43 +0800)
DatabaseColumns.php
patch
|
blob
|
history
diff --git
a/DatabaseColumns.php
b/DatabaseColumns.php
index
b3068b5
..
4f22c1f
100644
(file)
--- a/
DatabaseColumns.php
+++ b/
DatabaseColumns.php
@@
-24,16
+24,20
@@
class Pman_Core_DatabaseColumns extends Pman {
function get($table) {
$d = DB_DAtaObject::Factory($table);
function get($table) {
$d = DB_DAtaObject::Factory($table);
- $re = $d->autoJoin();
- //echo '<PRE>';print_r($re);
- $ret = array ();
-
- foreach($re['join_names'] as $c=>$f) {
- $re['cols'][$c] = $f;
+ if (method_exists($d, 'availableColumns')) {
+ $cols = $d->availableColumns();
+ } else {
+
+ $re = $d->autoJoin();
+ //echo '<PRE>';print_r($re);
+ $cols = $re['cols'] ;
+
+ foreach($re['join_names'] as $c=>$f) {
+ $cols[$c] = $f;
+ }
}
}
-
-
- foreach($re['cols'] as $c=>$f) {
+
+ foreach($cols as $c=>$f) {
$ret[] = array(
'name' => $c,
'val' => $f
$ret[] = array(
'name' => $c,
'val' => $f