Merge pull request #381 from gocardless/queries

Use single-line string for query SQL
gocardless · Dec 18, 2019 · 375a96e · 375a96e
2 parents 3c370ad + a6b2c49
commit 375a96e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v5.2.0, 17th December 2019
+
+- Issue `most_recent_transition_join` query as a single-line string [#381](https://github.com/gocardless/statesman/pull/381)
+
 ## v5.1.0, 22th November 2019
 
 - Correct `Statesman::Adapters::ActiveRecordQueries` error text [@Bramjetten](https://github.com/gocardless/statesman/pull/376)

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ protection.
 To get started, just add Statesman to your `Gemfile`, and then run `bundle`:
 
 ```ruby
-gem 'statesman', '~> 5.1.0'
+gem 'statesman', '~> 5.2.0'
 ```
 
 ## Usage

diff --git a/lib/statesman/adapters/active_record_queries.rb b/lib/statesman/adapters/active_record_queries.rb
@@ -101,10 +101,10 @@ def states_where(states)
         end
 
         def most_recent_transition_join
-          "LEFT OUTER JOIN #{model_table} AS #{most_recent_transition_alias}
-             ON #{model.table_name}.id =
-                  #{most_recent_transition_alias}.#{model_foreign_key}
-             AND #{most_recent_transition_alias}.most_recent = #{db_true}"
+          "LEFT OUTER JOIN #{model_table} AS #{most_recent_transition_alias} " \
+             "ON #{model.table_name}.id = " \
+                  "#{most_recent_transition_alias}.#{model_foreign_key} " \
+             "AND #{most_recent_transition_alias}.most_recent = #{db_true}"
         end
 
         private

diff --git a/lib/statesman/version.rb b/lib/statesman/version.rb
@@ -1,3 +1,3 @@
 module Statesman
-  VERSION = "5.1.0".freeze
+  VERSION = "5.2.0".freeze
 end