Skip to content

Commit 8a46773

Browse files
author
Marc J. Schmidt
committed
Merge pull request #611 from marcj/master
Fixed #477, Fixed #607, Fixed #604, Fixed #610
2 parents b03ed74 + ef1e4eb commit 8a46773

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+881
-583
lines changed

‎src/Propel/Generator/Behavior/Archivable/ArchivableBehavior.php

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ protected function addArchiveTable()
102102
// copy the indices
103103
foreach ($table->getIndices() as $index) {
104104
$copiedIndex = clone $index;
105-
$copiedIndex->setName('');
106105
$archiveTable->addIndex($copiedIndex);
107106
}
108107
// copy unique indices to indices

‎src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehavior.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace Propel\Generator\Behavior\ConcreteInheritance;
1212

13+
use Propel\Generator\Exception\InvalidArgumentException;
1314
use Propel\Generator\Model\Behavior;
1415
use Propel\Generator\Model\ForeignKey;
1516

@@ -66,7 +67,9 @@ public function modifyTable()
6667
if ($column->isPrimaryKey() && $this->isCopyData()) {
6768
$fk = new ForeignKey();
6869
$fk->setForeignTableCommonName($column->getTable()->getCommonName());
69-
$fk->setForeignSchemaName($column->getTable()->getSchema());
70+
if ($table->guessSchemaName() != $column->getTable()->guessSchemaName()) {
71+
$fk->setForeignSchemaName($column->getTable()->guessSchemaName());
72+
}
7073
$fk->setOnDelete('CASCADE');
7174
$fk->setOnUpdate(null);
7275
$fk->addReference($copiedColumn, $column);
@@ -123,7 +126,11 @@ protected function getParentTable()
123126
$tableName = $this->getParameter('schema').$database->getPlatform()->getSchemaDelimiter().$tableName;
124127
}
125128

126-
return $database->getTable($tableName);
129+
if (!$table = $database->getTable($tableName)) {
130+
throw new InvalidArgumentException(sprintf('Table "%s" used in the concrete_inheritance behavior at table "%s" not exist.', $tableName, $this->getTable()->getName()));
131+
}
132+
133+
return $table;
127134
}
128135

129136
protected function isCopyData()

‎src/Propel/Generator/Builder/Util/SchemaReader.php

+10-2
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,13 @@ public function startElement($parser, $name, $attributes)
232232
break;
233233

234234
case 'index':
235-
$this->currIndex = $this->currTable->addIndex($attributes);
235+
$this->currIndex = new Index();
236+
$this->currIndex->loadMapping($attributes);
236237
break;
237238

238239
case 'unique':
239-
$this->currUnique = $this->currTable->addUnique($attributes);
240+
$this->currUnique = new Unique();
241+
$this->currUnique->loadMapping($attributes);
240242
break;
241243

242244
case 'vendor':
@@ -359,6 +361,12 @@ protected function _throwInvalidTagException($parser, $tag_name)
359361

360362
public function endElement($parser, $name)
361363
{
364+
if ('index' === $name) {
365+
$this->currTable->addIndex($this->currIndex);
366+
} else if ('unique' === $name) {
367+
$this->currTable->addUnique($this->currUnique);
368+
}
369+
362370
if (self::DEBUG) {
363371
print('endElement(' . $name . ") called\n");
364372
}

‎src/Propel/Generator/Command/MigrationDiffCommand.php

+36-13
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ protected function configure()
4141
->addOption('output-dir', null, InputOption::VALUE_REQUIRED, 'The output directory', self::DEFAULT_OUTPUT_DIRECTORY)
4242
->addOption('migration-table', null, InputOption::VALUE_REQUIRED, 'Migration table name', self::DEFAULT_MIGRATION_TABLE)
4343
->addOption('connection', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Connection to use', array())
44+
->addOption('table-renaming', null, InputOption::VALUE_NONE, 'Detect table renaming', null)
4445
->addOption('editor', null, InputOption::VALUE_OPTIONAL, 'The text editor to use to open diff files', null)
4546
->setName('migration:diff')
4647
->setAliases(array('diff'))
@@ -85,8 +86,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
8586
}
8687

8788
$totalNbTables = 0;
88-
$schema = new Schema();
89-
foreach ($connections as $name => $params) {
89+
$reversedSchema = new Schema();
90+
91+
foreach ($manager->getDatabases() as $appDatabase) {
92+
93+
$name = $appDatabase->getName();
94+
if (!$params = @$connections[$name]) {
95+
$output->writeln(sprintf('<info>No connection configured for database "%s"</info>', $name));
96+
}
97+
9098
if ($input->getOption('verbose')) {
9199
$output->writeln(sprintf('Connecting to database "%s" using DSN "%s"', $name, $params['dsn']));
92100
}
@@ -99,14 +107,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
99107
continue;
100108
}
101109

110+
$additionalTables = [];
111+
foreach ($appDatabase->getTables() as $table) {
112+
if ($table->getSchema() && $table->getSchema() != $appDatabase->getSchema()) {
113+
$additionalTables[] = $table;
114+
}
115+
}
116+
102117
$database = new Database($name);
103118
$database->setPlatform($platform);
119+
$database->setSchema($appDatabase->getSchema());
104120
$database->setDefaultIdMethod(IdMethod::NATIVE);
105121

106122
$parser = $generatorConfig->getConfiguredSchemaParser($conn);
107-
$nbTables = $parser->parse($database, $this);
123+
$nbTables = $parser->parse($database, $additionalTables);
108124

109-
$schema->addDatabase($database);
125+
$reversedSchema->addDatabase($database);
110126
$totalNbTables += $nbTables;
111127

112128
if ($input->getOption('verbose')) {
@@ -120,27 +136,24 @@ protected function execute(InputInterface $input, OutputInterface $output)
120136
$output->writeln('No table found in all databases');
121137
}
122138

123-
$appDatasFromXml = $manager->getDataModels();
124-
$appDataFromXml = array_pop($appDatasFromXml);
125-
126139
// comparing models
127140
$output->writeln('Comparing models...');
141+
$tableRenaming = $input->getOption('table-renaming');
128142

129143
$migrationsUp = array();
130144
$migrationsDown = array();
131-
foreach ($schema->getDatabases() as $database) {
145+
foreach ($reversedSchema->getDatabases() as $database) {
132146
$name = $database->getName();
133147

134148
if ($input->getOption('verbose')) {
135149
$output->writeln(sprintf('Comparing database "%s"', $name));
136150
}
137151

138-
if (!$appDataFromXml->hasDatabase($name)) {
139-
// FIXME: tables present in database but not in XML
152+
if (!$appDataDatabase = $manager->getDatabase($name)) {
140153
continue;
141154
}
142155

143-
$databaseDiff = DatabaseComparator::computeDiff($database, $appDataFromXml->getDatabase($name));
156+
$databaseDiff = DatabaseComparator::computeDiff($database, $appDataDatabase, false, $tableRenaming);
144157

145158
if (!$databaseDiff) {
146159
if ($input->getOption('verbose')) {
@@ -151,6 +164,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
151164

152165
$output->writeln(sprintf('Structure of database was modified in datasource "%s": %s', $name, $databaseDiff->getDescription()));
153166

167+
foreach ($databaseDiff->getPossibleRenamedTables() as $fromTableName => $toTableName) {
168+
$output->writeln(sprintf(
169+
'<info>Possible table renaming detected: "%s" to "%s". It will be deleted and recreated. Use --table-renaming to only rename it.</info>',
170+
$fromTableName, $toTableName
171+
));
172+
}
173+
154174
$platform = $generatorConfig->getConfiguredPlatform(null, $name);
155175
$migrationsUp[$name] = $platform->getModifyDatabaseDDL($databaseDiff);
156176
$migrationsDown[$name] = $platform->getModifyDatabaseDDL($databaseDiff->getReverseDiff());
@@ -185,8 +205,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
185205
*/
186206
protected function getReverseClass(InputInterface $input)
187207
{
188-
$reverse = strstr($input->getOption('platform'), 'Platform', true);
189-
$reverse = 'Propel\\Generator\\Reverse\\'.$reverse.'SchemaParser';
208+
$reverse = $input->getOption('platform');
209+
if (false !== strpos($reverse, 'Platform')) {
210+
$reverse = strstr($input->getOption('platform'), 'Platform', true);
211+
}
212+
$reverse = sprintf('Propel\\Generator\\Reverse\\%sSchemaParser', ucfirst($reverse));
190213

191214
return $reverse;
192215
}

‎src/Propel/Generator/Command/MigrationUpCommand.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace Propel\Generator\Command;
1212

13+
use Propel\Runtime\Exception\RuntimeException;
1314
use Symfony\Component\Console\Input\InputOption;
1415
use Symfony\Component\Console\Input\InputInterface;
1516
use Symfony\Component\Console\Output\OutputInterface;
@@ -112,9 +113,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
112113
$stmt->execute();
113114
$res++;
114115
} catch (\PDOException $e) {
115-
$output->writeln(sprintf('<error>Failed to execute SQL "%s". Aborting migration.</error>', $statement));
116-
117-
return false;
116+
throw new RuntimeException(sprintf('<error>Failed to execute SQL "%s". Aborting migration.</error>', $statement), 0, $e);
118117
}
119118
}
120119
if (!$res) {

‎src/Propel/Generator/Manager/AbstractManager.php

+44-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Propel\Generator\Config\GeneratorConfigInterface;
1515
use Propel\Generator\Exception\BuildException;
1616
use Propel\Generator\Exception\EngineException;
17+
use Propel\Generator\Model\Database;
1718
use Propel\Generator\Model\Schema;
1819

1920
/**
@@ -31,6 +32,11 @@ abstract class AbstractManager
3132
*/
3233
protected $dataModels = array();
3334

35+
/**
36+
* @var Database[]
37+
*/
38+
protected $databases;
39+
3440
/**
3541
* Map of data model name to database name.
3642
* Should probably stick to the convention
@@ -162,6 +168,44 @@ public function getDataModelDbMap()
162168
return $this->dataModelDbMap;
163169
}
164170

171+
/**
172+
* @return Database[]
173+
*/
174+
public function getDatabases()
175+
{
176+
if (null === $this->databases) {
177+
$databases = array();
178+
foreach ($this->getDataModels() as $dataModel) {
179+
foreach ($dataModel->getDatabases() as $database) {
180+
if (!isset($databases[$database->getName()])) {
181+
$databases[$database->getName()] = $database;
182+
} else {
183+
$tables = $database->getTables();
184+
// Merge tables from different schema.xml to the same database
185+
foreach ($tables as $table) {
186+
if (!$databases[$database->getName()]->hasTable($table->getName(), true)) {
187+
$databases[$database->getName()]->addTable($table);
188+
}
189+
}
190+
}
191+
}
192+
}
193+
$this->databases = $databases;
194+
}
195+
196+
return $this->databases;
197+
}
198+
199+
/**
200+
* @param string $name
201+
* @return Database|null
202+
*/
203+
public function getDatabase($name)
204+
{
205+
$dbs = $this->getDatabases();
206+
return @$dbs[$name];
207+
}
208+
165209
/**
166210
* Sets whether to perform validation on the datamodel schema.xml file(s).
167211
*
@@ -233,11 +277,8 @@ protected function loadDataModels()
233277
$dom = new \DOMDocument('1.0', 'UTF-8');
234278
$dom->load($dmFilename);
235279

236-
237-
238280
$this->includeExternalSchemas($dom, $schema->getPath());
239281

240-
241282
// normalize (or transform) the XML document using XSLT
242283
if ($this->getGeneratorConfig()->getBuildProperty('schemaTransform') && $this->xsl) {
243284
$this->log('Transforming ' . $dmFilename . ' using stylesheet ' . $this->xsl->getPath());

‎src/Propel/Generator/Manager/SqlManager.php

-28
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,6 @@ public function getConnection($datasource)
6767
return $this->connections[$datasource];
6868
}
6969

70-
/**
71-
* @return array
72-
*/
73-
public function getDatabases()
74-
{
75-
if (null === $this->databases) {
76-
$databases = array();
77-
foreach ($this->getDataModels() as $dataModel) {
78-
foreach ($dataModel->getDatabases() as $database) {
79-
if (!isset($databases[$database->getName()])) {
80-
$databases[$database->getName()] = $database;
81-
} else {
82-
$tables = $database->getTables();
83-
// Merge tables from different schema.xml to the same database
84-
foreach ($tables as $table) {
85-
if (!$databases[$database->getName()]->hasTable($table->getName(), true)) {
86-
$databases[$database->getName()]->addTable($table);
87-
}
88-
}
89-
}
90-
}
91-
}
92-
$this->databases = $databases;
93-
}
94-
95-
return $this->databases;
96-
}
97-
9870
/**
9971
* @return string
10072
*/

‎src/Propel/Generator/Model/Database.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ public function addTable($table)
460460
if (!$table instanceof Table) {
461461
$tbl = new Table();
462462
$tbl->setDatabase($this);
463-
$tbl->setSchema($this->getSchema());
464463
$tbl->loadMapping($table);
465464

466465
return $this->addTable($tbl);
@@ -472,10 +471,6 @@ public function addTable($table)
472471
throw new EngineException(sprintf('Table "%s" declared twice', $table->getName()));
473472
}
474473

475-
if (null === $table->getSchema()) {
476-
$table->setSchema($this->getSchema());
477-
}
478-
479474
$this->tables[] = $table;
480475
$this->tablesByName[$table->getName()] = $table;
481476
$this->tablesByLowercaseName[strtolower($table->getName())] = $table;
@@ -798,7 +793,6 @@ protected function registerBehavior(Behavior $behavior)
798793
protected function setupTableReferrers()
799794
{
800795
foreach ($this->tables as $table) {
801-
$table->doNaming();
802796
$table->setupReferrers();
803797
}
804798
}
@@ -823,8 +817,10 @@ public function __toString()
823817

824818
$fks = [];
825819
foreach ($table->getForeignKeys() as $fk) {
826-
$fks[] = sprintf(" %s (%s => %s)",
820+
$fks[] = sprintf(" %s to %s.%s (%s => %s)",
827821
$fk->getName(),
822+
$fk->getForeignSchemaName(),
823+
$fk->getForeignTableCommonName(),
828824
join(', ', $fk->getLocalColumns()),
829825
join(', ', $fk->getForeignColumns())
830826
);

0 commit comments

Comments
 (0)