Fixes for unit tests being broken.
This commit is contained in:
parent
b447f6ca18
commit
13a1a6199c
@ -1080,12 +1080,15 @@ class Doctrine_Export extends Doctrine_Connection_Module
|
||||
}
|
||||
|
||||
$table = $plugin->getOption('pluginTable');
|
||||
|
||||
// Make sure plugin has a valid table
|
||||
if ($table instanceof Doctrine_Table) {
|
||||
$data = $table->getExportableFormat();
|
||||
|
||||
$data = $table->getExportableFormat();
|
||||
$query = $this->conn->export->createTableSql($data['tableName'], $data['columns'], $data['options']);
|
||||
|
||||
$query = $this->conn->export->createTableSql($data['tableName'], $data['columns'], $data['options']);
|
||||
|
||||
$sql = array_merge($sql, (array) $query);
|
||||
$sql = array_merge($sql, (array) $query);
|
||||
}
|
||||
}
|
||||
|
||||
return $sql;
|
||||
|
@ -24,6 +24,4 @@ if ($action == 'server') {
|
||||
$query = new Doctrine_Resource_Query();
|
||||
|
||||
$users = $query->from('User u, u.Phonenumber p, u.Address a, u.Book b, b.Author a')->execute();
|
||||
|
||||
print_r($users);
|
||||
}
|
@ -1,9 +1,4 @@
|
||||
---
|
||||
Test:
|
||||
inheritance:
|
||||
extends: User
|
||||
keyField: otype
|
||||
keyValue: 1
|
||||
Account:
|
||||
tableName: account
|
||||
className: Account
|
||||
|
Loading…
x
Reference in New Issue
Block a user