Skip to content
Browse files

[Generator] renamed set/getMappingSchema to set/getParentSchema in Da…

…tabase class.
  • Loading branch information...
1 parent 59eac43 commit e2b94c871ab0d139303f7f84978b84a0cddafd5e @hhamon hhamon committed May 6, 2012
View
4 UPDATE.md
@@ -63,15 +63,15 @@ Before:
After:
- public function setMappingSchema(Schema $parent)
+ public function setParentSchema(Schema $parent)
Before:
public function getAppData()
After:
- public function getMappingSchema()
+ public function getParentSchema()
## `Propel\Generator\Model\AppData` class has been renamed to `Schema`.
View
2 src/Propel/Generator/Builder/Util/SchemaReader.php
@@ -16,7 +16,7 @@
use Propel\Generator\Platform\PlatformInterface;
/**
- * A class that is used to parse an input xml schema file and creates an Schema
+ * A class that is used to parse an input xml schema file and creates a Schema
* PHP object.
*
* @author Hans Lellelid <hans@xmpl.org> (Propel)
View
4 src/Propel/Generator/Model/Database.php
@@ -415,7 +415,7 @@ public function addTable($data)
*
* @param Schema $parent The parent schema
*/
- public function setMappingSchema(Schema $parent)
+ public function setParentSchema(Schema $parent)
{
$this->parentSchema = $parent;
}
@@ -425,7 +425,7 @@ public function setMappingSchema(Schema $parent)
*
* @return Schema
*/
- public function getMappingSchema()
+ public function getParentSchema()
{
return $this->parentSchema;
}
View
4 src/Propel/Generator/Model/Schema.php
@@ -217,7 +217,7 @@ public function hasDatabase($name)
public function addDatabase($db)
{
if ($db instanceof Database) {
- $db->setMappingSchema($this);
+ $db->setParentSchema($this);
if (null === $db->getPlatform()) {
if ($config = $this->getGeneratorConfig()) {
$pf = $config->getConfiguredPlatform(null, $db->getName());
@@ -232,7 +232,7 @@ public function addDatabase($db)
} else {
// XML attributes array / hash
$d = new Database();
- $d->setMappingSchema($this);
+ $d->setParentSchema($this);
$d->loadFromXML($db);
return $this->addDatabase($d); // calls self w/ different param type
View
2 tests/Propel/Tests/Generator/Model/TableTest.php
@@ -417,7 +417,7 @@ public function testAppendXmlNamespaceWithAutoPackage()
$schema->setGeneratorConfig($config);
$db = new Database('testDb');
- $db->setMappingSchema($schema);
+ $db->setParentSchema($schema);
$table = new Table('test');
$table->setDatabase($db);

0 comments on commit e2b94c8

Please sign in to comment.
Something went wrong with that request. Please try again.