Merge pull request balderdashy#79 from leedm777/limit-fix

mikermcneil · mikermcneil · commit bd3f4a4c6355 · 2014-02-01T08:52:21.000-08:00
Only supply LIMIT hack when necessary.
diff --git a/lib/sql.js b/lib/sql.js
@@ -299,13 +299,14 @@ var sql = {
 
     if (options.limit) {
       queryPart += 'LIMIT ' + options.limit + ' ';
-    } else {
-      // Some MySQL hackery here.  For details, see:
-      // http://stackoverflow.com/questions/255517/mysql-offset-infinite-rows
-      queryPart += 'LIMIT 18446744073709551610 ';
     }
 
     if (options.skip) {
+      // Some MySQL hackery here.  For details, see:
+      // http://stackoverflow.com/questions/255517/mysql-offset-infinite-rows
+      if (!options.limit) {
+          queryPart += 'LIMIT 18446744073709551610 ';
+      }
       queryPart += 'OFFSET ' + options.skip + ' ';
     }
 
