summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-10-18 18:16:07 -0700
committerBrion Vibber <brion@pobox.com>2010-10-18 18:16:07 -0700
commitd3f8a880a91c134ae2aefc18efc47923bccf3fd2 (patch)
tree563e207ceee4a24e10ee44557022bf12b7718880
parentb865ded7ffca54534dac858f20eada3882af9d04 (diff)
Fix misnamed unique constraint
-rw-r--r--db/core.php2
-rw-r--r--lib/schema.php6
2 files changed, 2 insertions, 6 deletions
diff --git a/db/core.php b/db/core.php
index 32f29c715..3fcc9b8fa 100644
--- a/db/core.php
+++ b/db/core.php
@@ -650,7 +650,7 @@ $schema['user_group'] = array(
),
'primary key' => array('id'),
'unique keys' => array(
- 'user_uri_key' => array('uri'),
+ 'user_group_uri_key' => array('uri'),
),
'foreign keys' => array(
'user_group_design_id_fkey' => array('design', array('design_id' => 'id')),
diff --git a/lib/schema.php b/lib/schema.php
index 391f0f1fd..6e9643b67 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -653,11 +653,7 @@ class Schema
function quoteValue($val)
{
- if (is_int($val) || is_float($val) || is_double($val)) {
- return strval($val);
- } else {
- return '"' . $this->conn->escapeSimple($val) . '"';
- }
+ return $this->conn->quoteSmart($val);
}
/**