Development

Changeset 6000

You must first sign up to be able to contribute.

Changeset 6000

Show
Ignore:
Timestamp:
11/13/07 20:06:27 (1 year ago)
Author:
dwhittle
Message:

dwhittle: removed propel complex builders (merged complex + basic)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/data/skeleton/project/config/propel.ini

    r5877 r6000  
    2626propel.defaultDateFormat = %x 
    2727 
    28 propel.complexObjectModel  = true 
    2928propel.schema.validate     = false 
    3029propel.samePhpName         = false 

  • branches/dwhittle/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php

    r5863 r6000  
    11<?php 
    22 
    3 require_once 'propel/engine/builder/om/php5/PHP5ComplexObjectBuilder.php'; 
     3require_once 'propel/engine/builder/om/php5/PHP5ObjectBuilder.php'; 
    44 
    55/* 
    …… 
    1717 * @version    SVN: $Id$ 
    1818 */ 
    19 class SfObjectBuilder extends PHP5ComplexObjectBuilder 
     19class SfObjectBuilder extends PHP5ObjectBuilder 
    2020{ 
    2121  public function build() 
    …… 
    2525      return sfToolkit::stripComments(parent::build()); 
    2626    } 
    27      
     27 
    2828    return parent::build(); 
    2929  } 

  • branches/dwhittle/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

    r5863 r6000  
    11<?php 
    22 
    3 require_once 'propel/engine/builder/om/php5/PHP5ComplexPeerBuilder.php'; 
     3require_once 'propel/engine/builder/om/php5/PHP5PeerBuilder.php'; 
    44 
    55/* 
    …… 
    1717 * @version    SVN: $Id$ 
    1818 */ 
    19 class SfPeerBuilder extends PHP5ComplexPeerBuilder 
     19class SfPeerBuilder extends PHP5PeerBuilder 
    2020{ 
    2121  public function build() 
    …… 
    268268    $script .= $tmp; 
    269269  } 
    270    
     270 
    271271  protected function addDoSelectJoinAllExcept(&$script) 
    272272  { 

  • branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/default.properties

    r5944 r6000  
    8383propel.addTimeStamp = true 
    8484propel.basePrefix = Base 
    85 propel.complexObjectModel = true 
    8685propel.saveException = PropelException 
    8786propel.emulateForeignKeyConstraints = false 
    …… 
    210209 
    211210# Object Model builders 
    212 propel.builder.peer.class = propel.engine.builder.om.php5.PHP5ComplexPeerBuilder 
    213 propel.builder.object.class = propel.engine.builder.om.php5.PHP5ComplexObjectBuilder 
     211propel.builder.peer.class = propel.engine.builder.om.php5.PHP5PeerBuilder 
     212propel.builder.object.class = propel.engine.builder.om.php5.PHP5ObjectBuilder 
    214213propel.builder.objectstub.class = propel.engine.builder.om.php5.PHP5ExtensionObjectBuilder 
    215214propel.builder.peerstub.class = propel.engine.builder.om.php5.PHP5ExtensionPeerBuilder 

  • branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/projects/bookstore/schema.xml

    r5944 r6000  
    55    <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" 
    66      description="Book Id" /> 
    7     <column name="title" required="true" size="255" description="Book Title" /> 
     7    <column name="title" type="VARCHAR" required="true" size="255" description="Book Title" /> 
    88    <column name="isbn" required="true" type="VARCHAR" size="24" phpName="ISBN" 
    99      description="ISBN Number" />