remove special handling of columns with double quotes in them (refs #4617)

zeelot · zeelot · commit 6458ca770a36 · 2012-10-20T18:34:30.000-07:00
diff --git a/classes/Kohana/Database.php b/classes/Kohana/Database.php
@@ -530,11 +530,6 @@ public function quote_column($column)
 			{
 				return $column;
 			}
-			elseif (strpos($column, '"') !== FALSE)
-			{
-				// Quote the column in FUNC("column") identifiers
-				$column = preg_replace('/"(.+?)"/e', '$this->quote_column("$1")', $column);
-			}
 			elseif (strpos($column, '.') !== FALSE)
 			{
 				$parts = explode('.', $column);

Original file line number	Diff line number	Diff line change
`@@ -530,11 +530,6 @@ public function quote_column($column)`
`530`	`530`	`{`
`531`	`531`	`return $column;`
`532`	`532`	`}`
`533`		`- elseif (strpos($column, '"') !== FALSE)`
`534`		`- {`
`535`		`- // Quote the column in FUNC("column") identifiers`
`536`		`- $column = preg_replace('/"(.+?)"/e', '$this->quote_column("$1")', $column);`
`537`		`- }`
`538`	`533`	`elseif (strpos($column, '.') !== FALSE)`
`539`	`534`	`{`
`540`	`535`	`$parts = explode('.', $column);`