Merge pull request #101 from havvg/master

sync README files and fix schema inheritance part
This commit is contained in:
William DURAND 2012-02-06 14:03:14 -08:00
commit 98bef28210
2 changed files with 5 additions and 4 deletions

View file

@ -11,18 +11,19 @@ If you want to use the bundle with a **Symfony2 version 2.x.x** (actually, a ver
Currently supports:
* Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/*schema.xml`.
* Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/config/*schema.xml`.
* Insertion of SQL statements.
* Runtime autoloading of Propel and generated classes.
* Propel runtime initialization through the XML configuration.
* Migrations [Propel 1.6](http://www.propelorm.org/documentation/10-migrations.html).
* Reverse engineering from [existing database](http://www.propelorm.org/wiki/Documentation/1.6/Existing-Database).
* Reverse engineering from [existing database](http://www.propelorm.org/cookbook/working-with-existing-databases.html).
* Integration to the Symfony2 Profiler.
* Load SQL, YAML and XML fixtures.
* Create/Drop databases.
* Integration with the Form component.
* Integration with the Security component.
* Propel ParamConverter can be used with Sensio Framework Extra Bundle.
* Schema Inheritance
For documentation, see:

View file

@ -401,7 +401,7 @@ Currently only schema inheritance is provided.
### Schema Inheritance ###
You can override the defined schema of a bundle from within its child bundle.
The child's schema will *completely* override the parent's one.
To make use of the inheritance you only need to drop a schema file in the `Resources/config` folder of the child bundle.
**IMPORTANT**: If there is *at least one* schema file in the child bundle, *none* of the parent's schema files will be used.
Each file can be overridden without interfering with other schema files.
If you want to remove parts of a schema, you only need to add an empty schema file.