Development

Changeset 5751 for plugins/sfPropelAlternativeSchemaPlugin

You must first sign up to be able to contribute.

Show
Ignore:
Timestamp:
10/29/07 18:33:44 (6 years ago)
Author:
francois
Message:

reverted YAML schema confusion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfPropelAlternativeSchemaPlugin/lib/sfPropelDatabaseSchema.class.php

    r5746 r5751  
    440440              'required'      => true, 
    441441              'primaryKey'    => true, 
    442               'autoincrement' => true 
     442              'autoIncrement' => true 
    443443            ); 
    444444            $has_primary_key = true; 
    …… 
    494494          'required'      => true, 
    495495          'primaryKey'    => true, 
    496           'autoincrement' => true 
     496          'autoIncrement' => true 
    497497        ); 
    498498      } 
    …… 
    600600    if (is_array($column) && isset($column['index'])) 
    601601    { 
    602       if ($column['index'] == 'unique') 
     602      if ($column['index'] === 'unique') 
    603603      { 
    604604        $attributes_string .= "    <unique name=\"${tb_name}_${col_name}_unique\">\n"; 
    …… 
    898898      foreach ($columns as $column => $attributes) 
    899899      { 
    900         if ($column == 'id' && !array_diff($attributes, array('type' => 'integer', 'required' => 'true', 'primaryKey' => 'true', 'autoincrement' => 'true'))) 
     900        if ($column == 'id' && !array_diff($attributes, array('type' => 'integer', 'required' => 'true', 'primaryKey' => 'true', 'autoIncrement' => 'true'))) 
    901901        { 
    902902          // simplify primary keys 

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

    r5578 r5751  
    33 
    44  <table name="ab_group" phpName="Group" package="foo.bar.lib.model" isI18N="true" i18nTable="ab_group_i18n"> 
    5     <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" /> 
     5    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" /> 
    66    <column name="name" type="varchar" size="50" /> 
    77  </table> 
    …… 
    1919    </foreign-key> 
    2020    <column name="created_at" type="timestamp" /> 
    21     <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" /> 
     21    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" /> 
    2222  </table> 
    2323   
    …… 
    5858    <column name="user_id" type="integer" /> 
    5959    <column name="created_at" type="timestamp" /> 
    60     <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" /> 
     60    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" /> 
    6161    <index name="my_index"> 
    6262      <index-column name="title" />