Changeset 5519

Timestamp:

10/15/07 11:17:53 (1 year ago)

Author:

francois

Message:

sfPropelAlternativeSchemaPlugin Added a new foreignClass column attribute, Fixed a problem with model class names beginning with a lowercase character

Files:

• plugins/sfPropelAlternativeSchemaPlugin/README (modified) (4 diffs)
• plugins/sfPropelAlternativeSchemaPlugin/lib/sfPropelDatabaseSchema.class.php (modified) (5 diffs)
• plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/new_schema.yml (modified) (1 diff)
• plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/schema.xml (modified) (1 diff)
• plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/schema.yml (modified) (1 diff)
• plugins/sfPropelAlternativeSchemaPlugin/test/unit/sfPropelDatabaseSchemaTest.php (modified) (1 diff)

plugins/sfPropelAlternativeSchemaPlugin/README

@@ -110 +110 @@
-      stripped_title: { type: longvarchar, required: true, primaryKey: true, sequence: my_custom_sequence_name }
-      user_id:
-Table: ab_g
+Class: G
-      created_at:     timestamp
-      updated_at:
@@ -141 +141 @@
-
-The `connection` parameter is optional. If it is not set, it will take `propel` as a default value.
+
+Note that you can define foreign keys either with the usual `foreignTable` attribute, which expects a table name, or via the new `foreignClass` attribute, which expects a class name.
-
-Last but not least, all the 'magic' of the current syntax is still there (auto definition of primary keys, foreign keys, i18n tables, etc.).
@@ -251 +253 @@
-}}}
-
+== Checking that the plugin is installed ==
+
+Alternative schemas can sometimes look like normal YAML schemas. If this plugin is not installed, the usual schema interpreter may try to transform a schema with the alternative syntax into an XML schema, but based on the usual syntax. This will most probably cause problems.
+
+To avoid this, you should check that the plugin is installed before trying to interpret an alternative YAML schema. To do so, a good trick is to take advantage of the fact that YAML files are executed as PHP files before being converted to arrays. So add the following line on top of every alternative YAML schema:
+
+{{{
+<?php if(!is_callable(array('sfPropelDatabaseSchema', 'loadNewYaml'))) throw new Exception('You must install the sfPropelAlternativeSchemaPlugin to use this schema') ?>
+}}}
+
-== TODO ==
-
@@ -257 +269 @@
-== Changelog ==
-
+=== Trunk ===
+
+ * francois: Added a new `foreignClass` column attribute to define a foreign key from a phpName rather than from a tableName
+ * francois: Added section about plugin check in README
+ * francois: Fixed a problem with model class names beginning with a lowercase character
+
-=== 2007-10-05 | 0.9.0 Beta === 
-

plugins/sfPropelAlternativeSchemaPlugin/lib/sfPropelDatabaseSchema.class.php

@@ -140 +140 @@
-        {
-          $tableName = $classParams['tableName'];
-          if($tableName != sfInflector::underscore($className))
-          {
-            $tableAttributes['phpName'] = $className;
-          }
-          unset($classParams['tableName']);
-        }
@@ -150 +146 @@
-          $tableName = sfInflector::underscore($className);
-        }
+        
+        if(sfInflector::camelize($tableName) != $className)
+        {
+          $tableAttributes['phpName'] = $className;
+        }
+        
-        if($tableAttributes || $classParams)
-        {
@@ -435 +437 @@
-    foreach ($this->getTables() as $tb_name => $table)
-    {
-
+
+
+
+
+
+
+
+
+
-      {
-        $table_match = $tb_name;
+        break;
-      }
-    }
@@ -451 +462 @@
-      foreach ($column as $key => $value)
-      {
-
+Class', 'foreign
-        {
-          $attributes_string .= " $key=\"".htmlspecialchars($this->getCorrectValueFor($key, $value))."\"";
@@ -464 +475 @@
-
-    // conventions for foreign key attributes
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if (isset($column['onDelete']))
-      {

plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/new_schema.yml

@@ -33 +33 @@
-      user_id:
-      my_group:       { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull }
+      my_other_group: { type: integer, foreignClass: Group, foreignReference: id, onDelete: setnull }
-      created_at:     timestamp
-      updated_at:

plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/schema.xml

@@ -46 +46 @@
-      <reference local="my_group" foreign="id" />
-    </foreign-key>
+    <column name="my_other_group" type="integer" />
+    <foreign-key foreignTable="ab_group" onDelete="setnull">
+      <reference local="my_other_group" foreign="id" />
+    </foreign-key>
-    <column name="created_at" type="timestamp" />
-    <column name="updated_at" type="timestamp" />

plugins/sfPropelAlternativeSchemaPlugin/test/unit/fixtures/schema.yml

@@ -22 +22 @@
-    user_id:
-    my_group:       { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull }
+    my_other_group: { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull }
-    created_at:     timestamp
-    updated_at:

plugins/sfPropelAlternativeSchemaPlugin/test/unit/sfPropelDatabaseSchemaTest.php

@@ -41 +41 @@
-}
-
-45
+53
-
-require_once(dirname(__FILE__).'/../../lib/sfPropelDatabaseSchema.class.php');