Development

Changeset 1320

You must first sign up to be able to contribute.

Changeset 1320

Show
Ignore:
Timestamp:
05/05/06 12:30:58 (3 years ago)
Author:
fabien
Message:

fixed some Propel problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/data/bin/build.xml

    r1310 r1320  
    11<project name="sf" default="main" basedir="."> 
    22 
    3 <property name="project.dir" value="${application.startdir}/config" /> 
     3<property name="project.dir" value="config" /> 
    44<property name="build.properties" value="${propel_ini}"/> 
    55 
    66<target name="build-om"> 
    77  <phing dir="${propel_generator_dir}" target="om"> 
    8     <property name="project.dir" value="${application.startdir}/config" /> 
     8    <property name="project.dir" value="config" /> 
    99    <property name="project" value="${project}" /> 
    1010  </phing> 
     
    1313<target name="build-sql"> 
    1414  <phing dir="${propel_generator_dir}" target="sql"> 
    15     <property name="project.dir" value="${application.startdir}/config" /> 
     15    <property name="project.dir" value="config" /> 
    1616    <property name="project" value="${project}" /> 
    1717  </phing> 
     
    2020<target name="build-db"> 
    2121  <phing dir="${propel_generator_dir}" target="create-db"> 
    22     <property name="project.dir" value="${application.startdir}/config" /> 
     22    <property name="project.dir" value="config" /> 
    2323    <property name="project" value="${project}" /> 
    2424  </phing> 
     
    2727<target name="insert-sql"> 
    2828  <phing dir="${propel_generator_dir}" target="insert-sql"> 
    29     <property name="project.dir" value="${application.startdir}/config" /> 
     29    <property name="project.dir" value="config" /> 
    3030    <property name="project" value="${project}" /> 
    3131  </phing> 
     
    3434<target name="build-model-schema"> 
    3535  <phing dir="${propel_generator_dir}" target="creole"> 
    36     <property name="project.dir" value="${application.startdir}/config" /> 
     36    <property name="project.dir" value="config" /> 
    3737    <property name="project" value="${project}" /> 
    3838  </phing> 
  • trunk/lib/vendor/propel-generator/build-propel.xml

    r1310 r1320  
    125125  </target> 
    126126 
    127   <!--  temporary target to check whether postgres is being used with identifier quoting ON. 
    128     If so, a warning is issued, since identifier quoting is only paritally implemented & this point.  --> 
    129   <target name="pgsql-quoting-check"> 
    130     <if> 
    131       <and> 
    132       <equals arg1="${propel.database}" arg2="pgsql"/> 
    133       <equals arg1="${propel.disableIdentifierQuoting}" arg2=""/> 
    134     </and> 
    135     <then> 
    136       <warn>ATTENTION: It appears you are using PostgreSQL and you have identifier-quoting turned on.</warn> 
    137       <warn>It is suggested that you disable identifier quoting when using PostgreSQL -- especially if you</warn> 
    138       <warn>have case-sensitive columns in your database.</warn> 
    139       <warn></warn> 
    140       <warn>To disable identifier quoting, add the following property to your build.properties (or specify</warn> 
    141       <warn>it using -D on commandline):</warn> 
    142       <warn></warn> 
    143       <warn>propel.disableIdentifierQuoting=true</warn> 
    144       <warn></warn> 
    145       <warn>You can ignore this warning if you understand the issues related to case-sensitivity and Propel's</warn> 
    146       <warn>DDL-only implementation of identifier quoting.</warn> 
    147     </then> 
    148   </if> 
    149   </target> 
    150  
    151127  <target 
    152128    name="sql" 
    153     depends="sql-check,pgsql-quoting-check
     129    depends="sql-check
    154130    unless="propel.internal.sql.uptodate" 
    155131    description="==> generates the SQL for your project">