activerecord 4.0.10.rc1 → 4.0.10.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2615e59df2a45d733db0443fc18cdcbbe8c23a
-  data.tar.gz: 4f80740add455d8f6216565e6173b926d3966098
+  metadata.gz: 4531642a42d912b4196f8b84d208cdc11db3d580
+  data.tar.gz: ccec8990e94cb81f7a1ac8d8490998da72d14f6f
 SHA512:
-  metadata.gz: 75ebff890bf4e8fbd498066ca8ee231b07f7f6194f48eeb01a1ac6aec6f045bcdbd5bf307e57160a2542a1416167becf0ba949ae6e313d542f8e162efe03539b
-  data.tar.gz: a523ea0a98c5bd43b62b90c02053fcc0056213ac411769675cf43e4be641e2839f96c6f31477d8e0bdc175df71fa4336aced6a9b528ae04d91c6620fe1f4f40d
+  metadata.gz: 5090f7c0fcd50099472c4ab41d0c4481e92f98db57909c7657053173ab2688a8b2b7fbef6add5a70b5a9d949b9013ddf585a9374d66b9d494dcf980e8aa3818b
+  data.tar.gz: 58e52c056e8738312c798c969114e92ff92c3eff587f21d2d76a5a21267f08069d9551c189553ff3f30fae9dc17fbd2a5f99c0316bd2672b7bd08f41fed2a102

data/CHANGELOG.md

@@ -1,6 +1,13 @@
-## Rails 4.0.10 (August 19, 2014) ##
+## Rails 4.0.10 (September 8, 2014) ##
 
-*   Fix regression on after_commit that didnt fire when having nested transactions.
+*   Fixed a regression where whitespaces were stripped from DISTINCT queries in
+    PostgreSQL.
+
+    *Agis Anastasopoulos*
+
+    Fixes #16623.
+
+*   Fix regression on after_commit that didn't fire when having nested transactions.
 
     Fixes #16425
 

data/lib/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -493,7 +493,8 @@ module ActiveRecord
               # Convert Arel node to string
               s = s.to_sql unless s.is_a?(String)
               # Remove any ASC/DESC modifiers
-              s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '')
+              s.gsub(/\s+(?:ASC|DESC)\b/i, '')
+               .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
           [super, *order_columns].join(', ')

data/lib/active_record/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   # Returns the version of the currently loaded ActiveRecord as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.10.rc1"
+    Gem::Version.new "4.0.10.rc2"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.10.rc1
+  version: 4.0.10.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).