From f228e479e181c8c7bc41bbaf3f54be3418d90b42 Mon Sep 17 00:00:00 2001 From: Tatsujin Chin Date: Tue, 23 Oct 2018 09:09:15 +0800 Subject: [PATCH] fix assembler count (#299) --- spec/granite/query/spec_helper.cr | 2 +- src/granite/query/assemblers/base.cr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/granite/query/spec_helper.cr b/spec/granite/query/spec_helper.cr index d5fe938e..fd55a566 100644 --- 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 index 19798de6..8585dd2a 100644 --- 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