Ticket #3473: propel-inheritance.patch

lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php

@@ -47 +47 @@
-require_once(dirname(__FILE__).'/../../../../util/sfToolkit.class.php');
-require_once(dirname(__FILE__).'/../../../../yaml/sfYaml.class.php');
-
-61
+77
-
-$t->diag('Classical YAML to XML conversion');
-$p = new sfPropelDatabaseSchema();

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

@@ -4 +4 @@
-  <table name="ab_group" phpName="Group" package="foo.bar.lib.model" isI18N="true" i18nTable="ab_group_i18n">
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <column name="name" type="varchar" size="50" />
+    <column name="type" type="varchar" size="50" inheritance="single">
+      <inheritance extends="foo.bar.lib.model.Group" key="tight" class="Group_Tight" />
+      <inheritance extends="foo.bar.lib.model.Group" key="loose" class="Group_Loose" />
+    </column>
-  </table>
-
-  <table name="cd_user" phpName="User" isI18N="true" i18nTable="cd_user_i18n">

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

@@ -4 +4 @@
-    _attributes:    { phpName: Group, package: foo.bar.lib.model }
-    id:
-    name:           varchar(50)
+    type:           varchar(50)
+    _inheritance:
+      column:       type
+      classes:
+        tight:      Group_Tight
+        loose:      Group_Loose
-    
-  cd_user:
-    _attributes:    { phpName: User, isI18N: true, i18nTable: cd_user_i18n }

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

@@ -10 +10 @@
-    columns:
-      id:
-      name:           varchar(50)
+      type:           varchar(50)
+    inheritance:
+      column:         type
+      classes:
+        tight:        Group_Tight
+        loose:        Group_Loose
-  
-  User:
-    tableName:        cd_user

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

@@ -116 +116 @@
-            case '_behaviors':
-              $classes[$phpName]['behaviors'] = $column_params;
-              break;
+            case '_inheritance':
+              $classes[$phpName]['inheritance'] = $column_params;
+              break;
-            case '_foreignKeys':
-              $classes[$phpName]['foreignKeys'] = $column_params;
-              break;
@@ -191 +194 @@
-          unset($classParams['behaviors']);
-        }
-        
+        // Inheritance
+        if (isset($classParams['inheritance']))
+        {
+          $tableParams['_inheritance'] = $classParams['inheritance'];
+          unset($classParams['inheritance']);
+        }
+        
-        // Table attributes
-        $tableAttributes = array();
-        if (isset($classParams['tableName']))
@@ -247 +257 @@
-      // columns
-      foreach ($this->getChildren($table) as $col_name => $column)
-      {
+        // inheritance
+        if (isset($table['_inheritance']) && 
+            isset($table['_inheritance']['column']) && 
+            $col_name == $table['_inheritance']['column'] && 
+            isset($table['_inheritance']['classes']) && 
+            is_array($table['_inheritance']['classes']))
+        {
+          $column['inheritance'] = $table['_inheritance']['classes'];
+          unset($table['_inheritance']);
+        }
+        
-        $xml .= "    <column name=\"$col_name\"".$this->getAttributesForColumn($tb_name, $col_name, $column);
-      }
-
@@ -523 +544 @@
-    {
-      foreach ($column as $key => $value)
-      {
-
+, 'inheritance'
-        {
-          $attributes_string .= " $key=\"".htmlspecialchars($this->getCorrectValueFor($key, $value), ENT_QUOTES, sfConfig::get('sf_charset'))."\"";
-        }
-      }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-    {