fix assembler count (#299)

amberframework · Oct 23, 2018 · f228e47 · f228e47
1 parent 0a8a255
commit f228e47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/spec/granite/query/spec_helper.cr b/spec/granite/query/spec_helper.cr
@@ -33,5 +33,5 @@ end
 def ignore_whitespace(expected : String)
   whitespace = "\\s+"
   compiled = expected.split(/\s/).map { |s| Regex.escape s }.join(whitespace)
-  Regex.new compiled, Regex::Options::IGNORE_CASE ^ Regex::Options::MULTILINE
+  Regex.new "^\\s*#{compiled}\\s*$", Regex::Options::IGNORE_CASE ^ Regex::Options::MULTILINE
 end
diff --git a/src/granite/query/assemblers/base.cr b/src/granite/query/assemblers/base.cr
@@ -114,7 +114,7 @@ module Granite::Query::Assembler
         s << "FROM #{table_name}"
         s << where
         s << group_by
-        s << order
+        s << order(use_default_order: false)
       end
 
       Executor::Value(Model, Int64).new sql, numbered_parameters, default: 0_i64