- rel 13; one more fix

[packages/php-propel.git] / escape.patch

--- a/runtime/classes/propel/util/BasePeer.php	2018-06-08 09:24:24.133168452 +0200
+++ a/runtime/classes/propel/util/BasePeer.php	2018-06-08 11:36:57.364405761 +0200
@@ -353,8 +353,13 @@
 
 			$stmt = null;
 			try {
-
-				$sql = "UPDATE " . $tableName . " SET ";
+				$sql = "UPDATE ";
+                                if ($db->useQuoteIdentifier()) {
+                                        $sql .= $db->quoteIdentifierTable($tableName);
+                                } else {
+                                        $sql .= $tableName;
+                                }
+                                $sql .= " SET ";
 				$p = 1;
 				foreach ($updateTablesColumns[$tableName] as $col) {
 					$updateColumnName = substr($col, strrpos($col, '.') + 1);
@@ -886,7 +891,11 @@
 					$condition .= ' AND ';
 				}
 			}
-
+			if ($db->useQuoteIdentifier()) {
+				$_rightTable = $db->quoteIdentifierTable($rightTable);
+			} else {
+				$_rightTable = $rightTable;
+			}
 			// add 'em to the queues..
 			if ($joinType = $join->getJoinType()) {
 			  // real join
@@ -894,7 +903,7 @@
 					$fromClause[] = $leftTable . $leftTableAlias;
 				}
 				$joinTables[] = $rightTable . $rightTableAlias;
-				$joinClause[] = $join->getJoinType() . ' ' . $rightTable . $rightTableAlias . " ON ($condition)";
+				$joinClause[] = $join->getJoinType() . ' ' . $_rightTable . $rightTableAlias . " ON ($condition)";
 			} else {
 			  // implicit join, translates to a where
 				$fromClause[] = $leftTable . $leftTableAlias;