Changeset 3743:07ef48e3d0e5

Timestamp:

03/30/18 00:15:46 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Work in progress, not yet finished

File:

• inc/core/class.dc.selectstatement.php (modified) (5 diffs)

inc/core/class.dc.selectstatement.php

@@ -149 +149 @@
         }
         if (is_array($c)) {
-            $c          = array_map(trim(ltrim($c, ',')), $c); // Cope with legacy code
+            $filter = function($v) {
+                return trim(ltrim($v, ','));
+            };
+            $c          = array_map($filter, $c); // Cope with legacy code
             $this->from = array_merge($this->from, $c);
         } else {
@@ -360 +363 @@
 
     /**
-     * Escape an identifier
-     *
-     * @param      string  $identifier  The identifier
+     * Escape a value
+     *
+     * @param      string  $value  The value
      *
      * @return     string
      */
-    public function escape($identifier)
-    {
-        return $this->con->escape($identifier);
+    public function escape($value)
+    {
+        return $this->con->escape($value);
     }
 
@@ -394 +397 @@
     {
         return $this->con->dateFormat($field, $pattern);
+    }
+
+    /**
+     * Return an SQL formatted REGEXP clause
+     *
+     * @param      string  $value  The value
+     *
+     * @return     string
+     */
+    public function regexp($value)
+    {
+        if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
+            $clause = "REGEXP '^" . $this->escape(preg_quote($value)) . "[0-9]+$'";
+        } elseif ($this->con->driver() == 'pgsql') {
+            $clause = "~ '^" . $this->escape(preg_quote($value)) . "[0-9]+$'";
+        } else {
+            $clause = "LIKE '" .
+                $sql->escape(preg_replace(array('%', '_', '!'), array('!%', '!_', '!!'), $value)) .
+                "%' ESCAPE '!'";
+        }
+        return $clause;
+    }
+
+    /**
+     * Quote and escape a value if necessary (type string)
+     *
+     * @param      mixed    $value   The value
+     * @param      boolean  $escape  The escape
+     *
+     * @return     string
+     */
+    public function quote($value, $escape = true)
+    {
+        return
+            (is_string($value) ? "'" : '') .
+            ($escape ? $this->con->escape($value) : $value) .
+            (is_string($value) ? "'" : '');
     }
 
@@ -470 +510 @@
         }
 
-        return $query;
+        return trim($query);
     }
 
@@ -496 +536 @@
                 '\( ' => '(' // (<space> -> (
             );
-            foreach ($patterns as $from => $to) {
-                $s = preg_replace('!' . $from . '!', $to, $s);
+            foreach ($patterns as $pattern => $replace) {
+                $s = preg_replace('!' . $pattern . '!', $replace, $s);
             }
             return $s;
         };
-        return ($filter($local) !== $filter($external));
+        return ($filter($local) === $filter($external));
     }
 }