RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Fixes for unit tests being broken.

Browse Source
This commit is contained in:
Jonathan.Wage 2007-09-24 22:27:41 +00:00
parent b447f6ca18
commit 13a1a6199c
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Doctrine/Export.php
View File

@ -1080,12 +1080,15 @@ class Doctrine_Export extends Doctrine_Connection_Module
} }
$table = $plugin->getOption('pluginTable'); $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; return $sql;

2
playground/index.php
View File

@ -24,6 +24,4 @@ if ($action == 'server') {
$query = new Doctrine_Resource_Query(); $query = new Doctrine_Resource_Query();
$users = $query->from('User u, u.Phonenumber p, u.Address a, u.Book b, b.Author a')->execute(); $users = $query->from('User u, u.Phonenumber p, u.Address a, u.Book b, b.Author a')->execute();
print_r($users);
} }

5
tests/schema.yml
View File

@ -1,9 +1,4 @@
--- ---
Test:
inheritance:
extends: User
keyField: otype
keyValue: 1
Account: Account:
tableName: account tableName: account
className: Account className: Account