MDL-14679 improved limit handling

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index b32f45db38548344a4c6c40bc7c3ddc81a7e5b3b..ecda3256e989257959baf1692f342e6cb0a15aa4 100644 (file)
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -445,9 +445,9 @@ class mysqli_native_moodle_database extends moodle_database {
      * @throws dml_exception if error
      */
     public function get_recordset_sql($sql, array $params=null, $limitfrom=0, $limitnum=0) {
+        $limitfrom = (int)$limitfrom;
+        $limitnum  = (int)$limitnum;
         if ($limitfrom or $limitnum) {
-            $limitfrom = (int)$limitfrom;
-            $limitnum  = (int)$limitnum;
             if ($limitnum < 1) {
                 $limitnum = "18446744073709551615";
             }
@@ -484,9 +484,9 @@ class mysqli_native_moodle_database extends moodle_database {
      * @throws dml_exception if error
      */
     public function get_records_sql($sql, array $params=null, $limitfrom=0, $limitnum=0) {
+        $limitfrom = (int)$limitfrom;
+        $limitnum  = (int)$limitnum;
         if ($limitfrom or $limitnum) {
-            $limitfrom = (int)$limitfrom;
-            $limitnum  = (int)$limitnum;
             if ($limitnum < 1) {
                 $limitnum = "18446744073709551615";
             }

diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index b903599148459a6b53579a00ee12c2fbb50ab82e..9d370ebf7b54dd08d416408b116f04eaede9fe06 100644 (file)
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -540,9 +540,9 @@ class pgsql_native_moodle_database extends moodle_database {
      * @throws dml_exception if error
      */
     public function get_recordset_sql($sql, array $params=null, $limitfrom=0, $limitnum=0) {
+        $limitfrom = (int)$limitfrom;
+        $limitnum  = (int)$limitnum;
         if ($limitfrom or $limitnum) {
-            $limitfrom = (int)$limitfrom;
-            $limitnum  = (int)$limitnum;
             if ($limitnum < 1) {
                 $limitnum = "18446744073709551615";
             }
@@ -577,9 +577,9 @@ class pgsql_native_moodle_database extends moodle_database {
      * @throws dml_exception if error
      */
     public function get_records_sql($sql, array $params=null, $limitfrom=0, $limitnum=0) {
+        $limitfrom = (int)$limitfrom;
+        $limitnum  = (int)$limitnum;
         if ($limitfrom or $limitnum) {
-            $limitfrom = (int)$limitfrom;
-            $limitnum  = (int)$limitnum;
             if ($limitnum < 1) {
                 $limitnum = "18446744073709551615";
             }