From: Chuck Hagenbuch <chuck@horde.org>
Date: Sun, 13 Dec 2009 16:57:50 +0000 (-0500)
Subject: Fix detecting default string values
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=defa5b96157bd528dcf43bde662670aa525b9175;p=horde.git

Fix detecting default string values
---

diff --git a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php
index ecaf8107b..e62b4fccc 100644
--- a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php
@@ -29,6 +29,16 @@ class Horde_Db_Adapter_Sqlite_Column extends Horde_Db_Adapter_Abstract_Column
     protected static $_hasEmptyStringDefault = array('binary', 'string', 'text');
 
 
+    public function extractDefault($default)
+    {
+        $default = parent::extractDefault($default);
+        if ($this->isText()) {
+            $default = $this->_unquote($default);
+        }
+        return $default;
+    }
+
+
     /*##########################################################################
     # Type Juggling
     ##########################################################################*/
@@ -43,4 +53,27 @@ class Horde_Db_Adapter_Sqlite_Column extends Horde_Db_Adapter_Abstract_Column
         return str_replace(array('%00', '%25'), array("\0", '%'), $value);
     }
 
+
+    /*##########################################################################
+    # Protected
+    ##########################################################################*/
+
+    /**
+     * Unquote a string value
+     *
+     * @return string
+     */
+    protected function _unquote($string)
+    {
+        $first = substr($string, 0, 1);
+        if ($first == "'" || $first == '"') {
+            $string = substr($string, 1);
+            if (substr($string, -1) == $first) {
+                $string = substr($string, 0, -1);
+            }
+            $string = str_replace("$first$first", $first, $string);
+        }
+
+        return $string;
+    }
 }