Switch order of method definitions: matchNamedBinds() below matchSimpleBinds()

To correspond to the new code structure in compileBinds(),
and because named binds are arguably more advanced than simple binds.

Author: vlakoff

system/Database/Query.php

@@ -302,30 +302,6 @@ protected function compileBinds()
         }
     }
 
-    /**
-     * Match bindings
-     */
-    protected function matchNamedBinds(string $sql, array $binds): string
-    {
-        $replacers = [];
-
-        foreach ($binds as $placeholder => $value) {
-            // $value[1] contains the boolean whether should be escaped or not
-            $escapedValue = $value[1] ? $this->db->escape($value[0]) : $value[0];
-
-            // In order to correctly handle backlashes in saved strings
-            // we will need to preg_quote, so remove the wrapping escape characters
-            // otherwise it will get escaped.
-            if (is_array($value[0])) {
-                $escapedValue = '(' . implode(',', $escapedValue) . ')';
-            }
-
-            $replacers[":{$placeholder}:"] = $escapedValue;
-        }
-
-        return strtr($sql, $replacers);
-    }
-
     /**
      * Match bindings
      */
@@ -356,6 +332,30 @@ protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, i
         return $sql;
     }
 
+    /**
+     * Match bindings
+     */
+    protected function matchNamedBinds(string $sql, array $binds): string
+    {
+        $replacers = [];
+
+        foreach ($binds as $placeholder => $value) {
+            // $value[1] contains the boolean whether should be escaped or not
+            $escapedValue = $value[1] ? $this->db->escape($value[0]) : $value[0];
+
+            // In order to correctly handle backlashes in saved strings
+            // we will need to preg_quote, so remove the wrapping escape characters
+            // otherwise it will get escaped.
+            if (is_array($value[0])) {
+                $escapedValue = '(' . implode(',', $escapedValue) . ')';
+            }
+
+            $replacers[":{$placeholder}:"] = $escapedValue;
+        }
+
+        return strtr($sql, $replacers);
+    }
+
     /**
      * Returns string to display in debug toolbar
      */