postgres_ext 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ff2c9bb400e566e90b0eee78c7fbc3c4d20626
-  data.tar.gz: 235aeec3bafdf81928a2abadd4e19dcfdfcf26dd
+  metadata.gz: d0f08d6b38730f2207bde034d586897d7e23ef4d
+  data.tar.gz: 3fcbb19e1d568f78da0af6d27ca24ab608a7f3f1
 SHA512:
-  metadata.gz: 2fbaa25ab99012bea7aa49c91c95ccd088f8abe1b51a78b584454e661073224082782eeedca079b6d763d0fd0ac9a1ed44cfc5cd616eaa5440ab9d2b5bbbbbf5
-  data.tar.gz: 8991fc711864a429fcc3b95a9a76dbcd353f5723597d3027651934d5ef36208dcdf9fa3ee173dae52e821757582c7d2e39431326ad4971150564fe0ae47cd425
+  metadata.gz: 9266913406317d855c1a7eb6e6ed8205770c29560fb2a8f6bad749b431c6d471511300d6a142f9539a6e3cbb76876774ca6504f19d6b21c66f5648929e82efdf
+  data.tar.gz: 1a323f3e109c6c18d80f5c57fea2e6607d3e1ad86c457fcd24dc1666bfb517f60b87af008c74c2eb4bbc7e75f8c0dff657d4b8361bb56b3a95784721ceb9a6ec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0
+
+ * Fixes merging queries with CTE - chitux
+
 ## 2.4.1
 
  * Fixes error when creating a join between STI related models - edpaget

data/README.md

@@ -47,7 +47,7 @@ To work on postgres\_ext locally, follow these steps:
  1. Run `bundle install`, this will install (almost) all the development
     dependencies
  2. Run `gem install byebug` (not a declared dependency to not break CI)
- 3. Run `bundle exec rake setup`, this will set up the `.env` file necessary to run
+ 3. Run `bundle exec rake db:setup`, this will set up the `.env` file necessary to run
     the tests and set up the database
  4. Run `bundle exec rake db:create`, this will create the test database
  5. Run `bundle exec rake db:migrate`, this will set up the database tables required

data/lib/postgres_ext/active_record/relation.rb

@@ -3,6 +3,7 @@
 gdep = Gem::Dependency.new('activerecord', '~> 4.2.0.beta4')
 ar_version_cutoff = gdep.matching_specs.sort_by(&:version).last
 
+require 'postgres_ext/active_record/relation/merger'
 require 'postgres_ext/active_record/relation/query_methods'
 if ar_version_cutoff
   require 'postgres_ext/active_record/relation/predicate_builder/array_handler'

data/lib/postgres_ext/active_record/relation/merger.rb

@@ -0,0 +1,9 @@
+module ActiveRecord
+  class Relation
+    class Merger # :nodoc:
+      def normal_values
+        NORMAL_VALUES + [:with]
+      end
+    end
+  end
+end

data/lib/postgres_ext/active_record/relation/query_methods.rb

@@ -19,7 +19,7 @@ module ActiveRecord
           when Arel::Nodes::In, Arel::Nodes::Equality
             column = left_column(rel) || column_from_association(rel)
             equality_for_hstore(rel) if column.type == :hstore
-            
+
             if column.type == :hstore
               Arel::Nodes::ContainsHStore.new(rel.left, rel.right)
             elsif column.respond_to?(:array) && column.array
@@ -71,7 +71,7 @@ module ActiveRecord
           return if rel.right.is_a?(Hash)
           rel.right = {new_right_name => rel.right }
         end
-        
+
         rel.left.name = rel.left.relation.name.to_sym
         rel.left.relation.name = rel.left.relation.engine.table_name
       end
@@ -106,12 +106,12 @@ module ActiveRecord
           when Arel::Nodes::Equality
             Arel::Nodes::Equality.new(rel.right, Arel::Nodes::NamedFunction.new(function_name, [rel.left]))
           else
-            raise ArgumentError, "Invalid argument for .where.#{funciton_name.downcase}(), got #{rel.class}"
+            raise ArgumentError, "Invalid argument for .where.#{function_name.downcase}(), got #{rel.class}"
           end
         end
       end
     end
-    
+
     # WithChain objects act as placeholder for queries in which #with does not have any parameter.
     # In this case, #with must be chained with #recursive to return a new relation.
     class WithChain
@@ -206,6 +206,8 @@ module ActiveRecord
             end
             Arel::Nodes::As.new Arel::Nodes::SqlLiteral.new("\"#{name.to_s}\""), select
           end
+        when Arel::Nodes::As
+          with_value
         end
       end
       unless with_statements.empty?

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '2.4.1'
+  VERSION = '3.0.0'
 end

data/test/queries/common_table_expression_test.rb

@@ -31,6 +31,34 @@ describe 'Common Table Expression queries' do
     end
   end
 
+  describe '.with(common_table_exression_arel_nodes_as)' do
+    it 'generates an expression with the CTE' do
+      table_def = Arel::Nodes::SqlLiteral.new("update_cte(id, new_lucky)")
+      new_values = "(1,12),(2,3),(3,8)"
+
+      select = Arel::Nodes::SqlLiteral.new( "(VALUES #{new_values})" )
+      with = Arel::Nodes::As.new(table_def, select)
+
+      regex_safe = new_values.gsub("(","\\(").gsub(")","\\)")
+
+      query = Person.with(with).joins('JOIN update_cte ON update_cte.id = people.id')
+      query.to_sql.must_match(/WITH update_cte\(id, new_lucky\) AS \(VALUES #{regex_safe}\) SELECT \"people\".* FROM \"people\" JOIN update_cte ON update_cte.id = people.id/)
+    end
+
+    it 'generates an expression mixed with multiple with calls' do
+      table_def = Arel::Nodes::SqlLiteral.new("update_cte(id, new_lucky)")
+      new_values = "(1,12),(2,3),(3,8)"
+
+      select = Arel::Nodes::SqlLiteral.new( "(VALUES #{new_values})" )
+      with = Arel::Nodes::As.new(table_def, select)
+
+      regex_safe = new_values.gsub("(","\\(").gsub(")","\\)")
+
+      query = Person.with(with).with(lucky_number_seven: Person.where(lucky_number: 7)).joins('JOIN update_cte ON update_cte.id = people.id').joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id')
+      query.to_sql.must_match(/WITH update_cte\(id, new_lucky\) AS \(VALUES #{regex_safe}\), "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\) SELECT \"people\".* FROM \"people\" JOIN update_cte ON update_cte.id = people.id JOIN lucky_number_seven ON lucky_number_seven.id = people.id/)
+    end
+  end
+
   describe '.from_cte(common_table_expression_hash)' do
     it 'generates an expression with the CTE as the main table' do
       query = Person.from_cte('lucky_number_seven', Person.where(lucky_number: 7)).where(id: 5)
@@ -52,4 +80,12 @@ describe 'Common Table Expression queries' do
       people.model_name.must_equal 'Person'
     end
   end
+
+  describe '.merge(Model.with(common_table_expression_hash))' do
+    it 'keeps the CTE in the merged request' do
+      query = Person.all.merge(Person.with(lucky_number_seven: Person.where(lucky_number: 7))).joins('JOIN lucky_number_seven ON lucky_number_seven.id = people.id')
+      query.to_sql.must_match(/WITH "lucky_number_seven" AS \(SELECT "people".* FROM "people"(\s+)WHERE "people"."lucky_number" = 7\) SELECT "people".* FROM "people" JOIN lucky_number_seven ON lucky_number_seven.id = people.id/)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,6 +174,7 @@ files:
 - lib/postgres_ext/active_record/cte_proxy.rb
 - lib/postgres_ext/active_record/querying.rb
 - lib/postgres_ext/active_record/relation.rb
+- lib/postgres_ext/active_record/relation/merger.rb
 - lib/postgres_ext/active_record/relation/predicate_builder.rb
 - lib/postgres_ext/active_record/relation/predicate_builder/array_handler.rb
 - lib/postgres_ext/active_record/relation/query_methods.rb
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Extends ActiveRecord to handle native PostgreSQL data types