[packages/php-symfony] Rel 3; quote identifiers for mysql >= 5.7

[arekm]

commit eb991f77aa87edb376448f99675185fe8d19fdca
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 4 14:36:52 2023 +0200

    Rel 3; quote identifiers for mysql >= 5.7

 path.patch       | 45 +++++++++++++++++++++++++++++++++++++++++++++
 php-symfony.spec |  6 +++++-
 quote.patch      | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
---
diff --git a/php-symfony.spec b/php-symfony.spec
index cc9728e..c398229 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -8,12 +8,14 @@ Summary:	Open-source PHP web framework
 Summary(pl.UTF-8):	Szkielet aplikacji WWW w PHP o otwartych źródłach
 Name:		php-%{pkgname}
 Version:	1.4.20
-Release:	2
+Release:	3
 License:	various free licenses (distributable)
 Group:		Development/Languages/PHP
 Source0:	http://www.symfony-project.org/get/symfony-%{version}.tgz
 # Source0-md5:	3c3640ffbab023a1a8f78e0cbb554c10
 Patch0:		symfony1.4_php56.patch
+Patch1:         quote.patch
+Patch2:         path.patch
 URL:		http://symfony.com/legacy
 BuildRequires:	rpmbuild(macros) >= 1.654
 Requires:	Smarty
@@ -64,6 +66,8 @@ takich jak:
 %prep
 %setup  -q -n %{pkgname}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/path.patch b/path.patch
new file mode 100644
index 0000000..79f3f78
--- /dev/null
+++ b/path.patch
@@ -0,0 +1,45 @@
+diff -urN symfony-1.4.20.org/data/bin/symfony symfony-1.4.20/data/bin/symfony
+--- symfony-1.4.20.org/data/bin/symfony	2008-11-26 21:28:26.000000000 +0100
++++ symfony-1.4.20/data/bin/symfony	2023-10-04 14:35:36.873288358 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ /*
+diff -urN symfony-1.4.20.org/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony symfony-1.4.20/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony
+--- symfony-1.4.20.org/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony	2008-10-05 09:45:47.000000000 +0200
++++ symfony-1.4.20/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony	2023-10-04 14:35:36.873288358 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ /*
+diff -urN symfony-1.4.20.org/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony symfony-1.4.20/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony
+--- symfony-1.4.20.org/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony	2008-04-01 23:33:35.000000000 +0200
++++ symfony-1.4.20/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony	2023-10-04 14:35:36.873288358 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ /*
+diff -urN symfony-1.4.20.org/lib/task/generator/skeleton/project/symfony symfony-1.4.20/lib/task/generator/skeleton/project/symfony
+--- symfony-1.4.20.org/lib/task/generator/skeleton/project/symfony	2008-11-27 19:10:40.000000000 +0100
++++ symfony-1.4.20/lib/task/generator/skeleton/project/symfony	2023-10-04 14:35:36.873288358 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ /*
+diff -urN symfony-1.4.20.org/test/functional/fixtures/symfony symfony-1.4.20/test/functional/fixtures/symfony
+--- symfony-1.4.20.org/test/functional/fixtures/symfony	2009-04-04 16:00:15.000000000 +0200
++++ symfony-1.4.20/test/functional/fixtures/symfony	2023-10-04 14:35:36.873288358 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ /*
diff --git a/quote.patch b/quote.patch
new file mode 100644
index 0000000..157d971
--- /dev/null
+++ b/quote.patch
@@ -0,0 +1,40 @@
+--- a/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php	2010-03-16 00:09:22.000000000 +0100
++++ b/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php	2018-09-27 10:01:01.966687223 +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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-symfony.git/commitdiff/eb991f77aa87edb376448f99675185fe8d19fdca