commit e8cd3de5ed4c112c300789966bdc127b0cdabec2
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Jun 8 10:32:09 2018 +0200
- rel 12; fixes for joins
escape.patch | 27 +++++++++++++++++++++++++--
php-propel.spec | 2 +-
2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/php-propel.spec b/php-propel.spec
index 22846a9..67be754 100644
--- a/php-propel.spec
+++ b/php-propel.spec
@@ -4,7 +4,7 @@ Summary: Object persistence and query service for PHP5
Summary(pl.UTF-8): Usługa przechowywania i odpytywania obiektów dla PHP5
Name: php-%{pkgname}
Version: 1.4.2
-Release: 11
+Release: 12
License: LGPL v3
Group: Development/Languages/PHP
Source0: http://files.propelorm.org/%{pkgname}-%{version}.tar.gz
diff --git a/escape.patch b/escape.patch
index 418c425..7d56867 100644
--- a/escape.patch
+++ b/escape.patch
@@ -1,5 +1,5 @@
---- a/runtime/classes/propel/util/BasePeer.php 2018-05-30 14:27:10.799698441
+0200
-+++ b/runtime/classes/propel/util/BasePeer.php 2018-05-30 14:27:38.903159425
+0200
+--- a/runtime/classes/propel/util/BasePeer.php 2018-06-08 09:24:24.133168452
+0200
++++ b/runtime/classes/propel/util/BasePeer.php 2018-06-08 10:26:40.142239018
+0200
@@ -353,8 +353,13 @@
$stmt = null;
@@ -16,3 +16,26 @@
$p = 1;
foreach ($updateTablesColumns[$tableName] as
$col) {
$updateColumnName = substr($col,
strrpos($col, '.') + 1);
+@@ -886,15 +891,19 @@
+ $condition .= ' AND ';
+ }
+ }
+-
++ if ($db->useQuoteIdentifier()) {
++ $_rightTable =
$db->quoteIdentifierTable($rightTable);
++ } else {
++ $_rightTable = $rightTable;
++ }
+ // add 'em to the queues..
+ if ($joinType = $join->getJoinType()) {
+ // real join
+ if (!$fromClause) {
+ $fromClause[] = $leftTable .
$leftTableAlias;
+ }
+- $joinTables[] = $rightTable . $rightTableAlias;
+- $joinClause[] = $join->getJoinType() . ' ' .
$rightTable . $rightTableAlias . " ON ($condition)";
++ $joinTables[] = $_rightTable . $rightTableAlias;
++ $joinClause[] = $join->getJoinType() . ' ' .
$_rightTable . $rightTableAlias . " ON ($condition)";
+ } else {
+ // implicit join, translates to a where
+ $fromClause[] = $leftTable . $leftTableAlias;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-propel.git/commitdiff/e8cd3de5ed4c112c300789966bdc127b0cdabec2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
