Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed svn dependency in build file and some weird issues where the oc…

…i8 driver loses spaces in the sql while transforming positional to named parameters.
  • Loading branch information...
commit ae39a5d389965757876b022fb704b3bd849b3e08 1 parent 025735e
@romanb romanb authored
View
8 build.xml
@@ -142,16 +142,16 @@
<nativephpunit testfile="./tests/Doctrine/Tests/ORM/Performance/AllTests.php" testdirectory="./tests" haltonfailure="false" haltonerror="false" />
<tstamp/>
- <svnlastrevision svnpath="${svn.path}" workingcopy="." propertyname="svn.lastrevision"/>
- <copy file="${build.dir}/logs/testsuites.xml" tofile="${log.archive.dir}/${svn.lastrevision}/log.xml" overwrite="true"/>
+ <!--<svnlastrevision svnpath="${svn.path}" workingcopy="." propertyname="svn.lastrevision"/>-->
+ <copy file="${build.dir}/logs/testsuites.xml" tofile="${log.archive.dir}/latest/log.xml" overwrite="true"/>
<if><equals arg1="${test.pmd_reports}" arg2="1" />
<then>
<exec command="${test.pdepend_exec} --jdepend-xml=${build.dir}/logs/jdepend.xml ./lib/Doctrine" />
<exec command="${test.phpmd_exec} ./lib/Doctrine xml codesize --reportfile ${build.dir}/logs/phpmd.xml" />
- <copy file="${build.dir}/logs/jdepend.xml" tofile="${log.archive.dir}/${svn.lastrevision}/jdepend.xml" overwrite="true"/>
- <copy file="${build.dir}/logs/phpmd.xml" tofile="${log.archive.dir}/${svn.lastrevision}/phpmd.xml" overwrite="true"/>
+ <copy file="${build.dir}/logs/jdepend.xml" tofile="${log.archive.dir}/latest/jdepend.xml" overwrite="true"/>
+ <copy file="${build.dir}/logs/phpmd.xml" tofile="${log.archive.dir}/latest/phpmd.xml" overwrite="true"/>
</then>
</if>
</target>
View
1  lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -60,6 +60,7 @@ public function __construct($dbh, $statement)
* placeholders and converted to a named parameter.
*
* @param string $statement The SQL statement to convert.
+ * @todo review and test for lost spaces. we experienced missing spaces with oci8 in some sql statements.
*/
private function _convertPositionalToNamedPlaceholders($statement)
{
View
2  lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -815,7 +815,7 @@ protected function _getSelectEntitiesSQL(array $criteria, $assoc = null)
: $baseTableAlias;
$columnName = $this->_class->getQuotedColumnName($fieldName, $this->_platform);
- $orderBySql .= $orderBySql ? ', ' : 'ORDER BY ';
+ $orderBySql .= $orderBySql ? ', ' : ' ORDER BY ';
$orderBySql .= $tableAlias . '.' . $columnName . ' ' . $orientation;
}
Please sign in to comment.
Something went wrong with that request. Please try again.