Handle already quoted identifier.

contao · Dec 27, 2017 · 541a8ca · leofeyer · Jan 18, 2018 · 541a8ca
1 parent f2b7c43
commit 541a8ca
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/Resources/contao/library/Contao/Database.php b/src/Resources/contao/library/Contao/Database.php
@@ -40,6 +40,12 @@ class Database
 	 */
 	protected static $arrInstances = array();
 
+	/**
+	 * Quote character
+	 * @var string
+	 */
+	protected static $strQuoteCharacter;
+
 	/**
 	 * Connection ID
 	 * @var Connection
@@ -715,6 +721,17 @@ public function getUuid()
 	 */
 	public static function quoteColumnName($strName)
 	{
+		if (static::$strQuoteCharacter === null)
+		{
+			static::$strQuoteCharacter = \System::getContainer()->get('database_connection')->getDatabasePlatform()->getIdentifierQuoteCharacter();
+		}
+
+		// The identifier is quoted already
+		if (strncmp($strName, static::$strQuoteCharacter, 1) === 0 && substr_compare($strName, static::$strQuoteCharacter, -1) === 0)
+		{
+			return $strName;
+		}
+
 		return \System::getContainer()->get('database_connection')->quoteIdentifier($strName);
 	}