summaryrefslogtreecommitdiff
path: root/vendor/PicoDb
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-10-19 14:45:34 -0400
committerFrédéric Guillot <fred@kanboard.net>2014-10-19 14:45:34 -0400
commitc1c4d8380e6e1a2fb5eeed2e3051f2507a68614e (patch)
tree50c8e4147856afa6cd30a081564cbe1220808e55 /vendor/PicoDb
parent4da627d1beff2a7a775f1075237ea5721b478e39 (diff)
Update PicoDb
Diffstat (limited to 'vendor/PicoDb')
-rw-r--r--vendor/PicoDb/Database.php5
-rw-r--r--vendor/PicoDb/Drivers/Mysql.php1
-rw-r--r--vendor/PicoDb/Drivers/Sqlite.php1
3 files changed, 5 insertions, 2 deletions
diff --git a/vendor/PicoDb/Database.php b/vendor/PicoDb/Database.php
index 5d0beb8a..c09d8a92 100644
--- a/vendor/PicoDb/Database.php
+++ b/vendor/PicoDb/Database.php
@@ -86,6 +86,11 @@ class Database
public function escapeIdentifier($value)
{
+ // Do not escape custom query
+ if (strpos($value, '.') !== false || strpos($value, ' ') !== false) {
+ return $value;
+ }
+
return $this->pdo->escapeIdentifier($value);
}
diff --git a/vendor/PicoDb/Drivers/Mysql.php b/vendor/PicoDb/Drivers/Mysql.php
index 22277a01..96148a1c 100644
--- a/vendor/PicoDb/Drivers/Mysql.php
+++ b/vendor/PicoDb/Drivers/Mysql.php
@@ -70,7 +70,6 @@ class Mysql extends \PDO {
public function escapeIdentifier($value)
{
- if (strpos($value, '.') !== false) return $value;
return '`'.$value.'`';
}
} \ No newline at end of file
diff --git a/vendor/PicoDb/Drivers/Sqlite.php b/vendor/PicoDb/Drivers/Sqlite.php
index 83b61c40..38c823ae 100644
--- a/vendor/PicoDb/Drivers/Sqlite.php
+++ b/vendor/PicoDb/Drivers/Sqlite.php
@@ -51,7 +51,6 @@ class Sqlite extends \PDO {
public function escapeIdentifier($value)
{
- if (strpos($value, '.') !== false) return $value;
return '"'.$value.'"';
}
} \ No newline at end of file