Ticket #3473: propel-inheritance-patch2.patch

lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml

@@ -83 +83 @@
-    <column name="culture" isCulture="true" type="varchar" size="7" required="true" primaryKey="true" />
-  </table>
-
+  <table name="history">
+    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
+    <column name="type" type="varchar" size="64" inheritance="single">
+      <inheritance extends="lib.model.History" key="new_user" class="History_NewUser" />
+      <inheritance extends="lib.model.History" key="new_page" class="History_NewPage" />
+    </column>
+  </table>
+
-</database>

lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml

@@ -52 +52 @@
-  
-  ab_group_i18n:
-    motto:            longvarchar
+  
+  history:
+    _attributes:    { phpName: History }
+    id:
+    type:           { type: varchar(64) }
+    _inheritance:
+      column:       type
+      classes:
+        new_user:   History_NewUser
+        new_page:   History_NewPage

lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml

@@ -69 +69 @@
-    tableName:        ab_group_i18n
-    columns:
-      motto:          longvarchar
+  
+  History:
+    tableName:      history
+    columns:
+      id:
+      type:         { type: varchar(64) }
+    inheritance:
+      column:       type
+      classes:
+        new_user:   History_NewUser
+        new_page:   History_NewPage

lib/plugins/sfPropelPlugin/lib/propel/sfPropelDatabaseSchema.class.php

@@ -556 +556 @@
-        $extended_package = isset($this->database[$tb_name]['_attributes']['package']) ?
-          $this->database[$tb_name]['_attributes']['package'] :
-          $this->database['_attributes']['package'];
-        $extended_class = $this->database[$tb_name]['_attributes']['phpName'];
-        
+        $extended_class = isset($this->database[$tb_name]['_attributes']['phpName']) ?
+          $this->database[$tb_name]['_attributes']['phpName'] :
+          sfInflector::camelize($tb_name);
+        
-        foreach ($column['inheritance'] as $key => $class)
-        {
-          $attributes_string .= sprintf('      <inheritance extends="%s.%s" key="%s" class="%s" />%s',