- rel 12; fixes for joins

diff --git a/escape.patch b/escape.patch
index 418c425aece42048423ab4be8eb5d1f3aa0dc277..7d568671bd9df16ecb494a80f3ff3d0f3d482f1d 100644 (file)
--- 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;

diff --git a/php-propel.spec b/php-propel.spec
index 22846a9ccd70d4432e03525982df10db2decb99b..67be75430f440abfc05360cd2116fdab61c8aacf 100644 (file)
--- 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