Author: francois
Date: 2010-02-26 19:02:02 +0100 (Fri, 26 Feb 2010)
New Revision: 28314

Modified:
   plugins/sfPropel15Plugin/trunk/lib/addon/sfPropelDatabaseSchema.class.php
Log:
[sfPropel15Plugin] Fixed automated pk addition when concrete inheritance is set 
(closes #8344)

Modified: 
plugins/sfPropel15Plugin/trunk/lib/addon/sfPropelDatabaseSchema.class.php
===================================================================
--- plugins/sfPropel15Plugin/trunk/lib/addon/sfPropelDatabaseSchema.class.php   
2010-02-26 17:25:46 UTC (rev 28313)
+++ plugins/sfPropel15Plugin/trunk/lib/addon/sfPropelDatabaseSchema.class.php   
2010-02-26 18:02:02 UTC (rev 28314)
@@ -686,7 +686,7 @@
         }
       }
 
-      if (!$has_primary_key)
+      if (!$has_primary_key && 
!isset($this->database[$table]['_propel_behaviors']['concrete_inheritance']))
       {
         // convention for tables without primary key
         $this->database[$table]['id'] = array(

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to