postgres_ext 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e5d99adec7bf0164b0e2fc17902e80ef62d264
-  data.tar.gz: ca7ab1ff4f77d91b31062130e17e87a055db719c
+  metadata.gz: 9078ca33d9a9b96fa41f3082157f2bceb46319b9
+  data.tar.gz: 8797b9642f4c3757d3b450bbdef4ffbcc00dce72
 SHA512:
-  metadata.gz: 029878e575cb456781db615deb004839836a5bb46ccbd3a14c184b8e9b3b153c21c22b921e1938ed82378c9fc7f409799e882f623ff1913fb4dbd46e618685ca
-  data.tar.gz: 30a7dd666faf99922130a77cad0f25a148bc030b152ede31722475fe0c67addc29f08bf3f479a5e727ab3ff560667970ed96cf07f9ca2ad57d5039acdf8d78d7
+  metadata.gz: 96d7943795f68ab0e4ca85e12ca0d508844d29f78ff7baec44e952bb23c012290ffadceef317d5496a395cb896d1110289a2cf395998a107574a556dabb2e97c
+  data.tar.gz: 75c699237d3dfa87a62099d52dd84a1c77936d0ae730207bf3801bc1acc4112acfd0cf64521c2407cf79199033b025c3eeab91c747ef6b1c2ff3ae9d21c36ed0

data/.gitignore

@@ -1,3 +1,4 @@
+.env
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -1,28 +1,19 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
+- 1.9.3
+- 2.0.0
+- jruby-19mode
+
+env: DATABASE_URL=postgres://postgres@localhost/postgres_ext_test
 
 before_script:
-  - sudo /etc/init.d/postgresql stop
-  - sudo cp /etc/postgresql/9.1/main/pg_hba.conf ./
-  - sudo apt-get remove postgresql postgresql-9.1 -qq --purge
-  - source /etc/lsb-release
-  - echo "deb http://apt.postgresql.org/pub/repos/apt/ $DISTRIB_CODENAME-pgdg main" > pgdg.list
-  - sudo mv pgdg.list /etc/apt/sources.list.d/
-  - wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -
-  - sudo apt-get update -qq
-  - sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install postgresql-9.2 postgresql-contrib-9.2 -qq
-  - sudo /etc/init.d/postgresql stop
-  - sudo cp ./pg_hba.conf /etc/postgresql/9.2/main
-  - sudo /etc/init.d/postgresql start
-  - psql -c 'create database postgres_ext_test;' -U postgres -h localhost
-  - cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
-  - RAILS_ENV=test rake db:migrate
+- psql -c 'create database postgres_ext_test;' -U postgres -h localhost
+- rake db:migrate
 
 notifications:
-  email: 
-    - git@danmcclain.net
-  campfire:
+  email:
+  - git@danmcclain.net
+  hipchat:
     rooms:
-      - secure: "dNVxAfeOqRuA7k4Wu3H63deqV8Z1mmpVBdPEtkK2ry+mp+51RFHcO0cUJ/fI\nN4PXZu2wNWQlvz5LCMRPe+hxio/w8hTvgQxzBVvi0kuOh/22wXumdy7LR/RJ\nvyrrbP3+1hSxhzufyvIe/fOU11v31d3WRA1/q80ls9EkwzoDTNI="
+      secure: gebjx8Q/jmnNmf6l+SyQHHJjGn9RfA6s4e8sIoRBVt9pomkOCBvHq7++AjpVlqkXcvV6rK2L90rAEPKMP0QUS04vRtRY6LvwmjiQHFo99/gktG6LO+5/QGvy9zbK4PxWe35Yr1F98Gs0mQ+y/ZbU6u8rJsI7DM1iPq2ULzo/QUw=
+addons:
+  postgresql: '9.3'

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+## 2.2.0
+
+ * Adds Arel predications for `ANY` and `ALL` - Dan McClain
+ * Fixes errors with has\_and\_belongs\_to\_many associations - Jacob Swanner
+ * Adds with.recursive for recursive CTEs - Cody Cutrer
+ * Relation.with now accepts Arel::SelectMangers - Dan McClain
+
+## 2.1.3
+ 
+ * Fixes Arel 4.0.1 issues - Dan McClain
+ * Prevents coversion of string to order statement - Dan McClain
+  
+## 2.1.2
+
+ * Fixes calls to count when ranking a relation - Dan McClain
+ 
+## 2.1.1
+ 
+ * Fixes cte proxy so that it can create records - Dan McClain
+ 
+## 2.1.0
+ 
+ * Support added for common table expressions - Dan McClain
+ * Support added for rank windowing function - Dan McClain
+ * Insert Code Climate badge into README - Doug Yun
+  
+# 2.0.0
+ 
+ * JRuby fixes - Dan McClain
+ * Updates docs and description - Dan McClain
+ * Rails 4 support - Dan McClain
+ 
+# 1.0.0
+ 
+1.0.0 is the last major and minor release for Rails 3.2.x. Postgres\_ext
+will only receive bug fixes in the future. Also, bug fixes for 1.0.x
+will come from PRs only, future development efforts are concentrated on
+2.x.
+ 
+ * Fixing array tests in jruby - Dan McClain
+ * Removes encoding patches from PostgreSQLAdapter - Dan McClain
+ * Update documentation to reflect changes in 0.3.0 - Fabian Schwahn
+ * Allow conversion of string/text columns to array - Valentino
+ * Fix link to github issues in readme - Carlos Antonio da Silva
+
 ## 0.4.0
  * Adds support for (limited) support for PostgreSQL ranges - Dan McClain
 

data/README.md

@@ -4,6 +4,7 @@ Adds missing native PostgreSQL data types to ActiveRecord and convenient queryin
 
 [![Build Status](https://secure.travis-ci.org/dockyard/postgres_ext.png?branch=master)](http://travis-ci.org/dockyard/postgres_ext)
 [![Code Climate](https://codeclimate.com/github/dockyard/postgres_ext.png)](https://codeclimate.com/github/dockyard/postgres_ext)
+[![Gem Version](https://badge.fury.io/rb/postgres_ext.png)](http://badge.fury.io/rb/postgres_ext)
 
 ## Looking for help? ##
 
@@ -39,6 +40,18 @@ Where are the datatypes from PostgresExt 1.x? ActiveRecord 4.x includes
 all the data types that PostgresExt added to ActiveRecord 3.2.x. We'll
 be adding more datatypes as we come across them.
 
+## Developing
+
+To work on postgres\_ext locally, follow these steps:
+
+ 1. Run `bundle install`, this will install all the development
+    dependencies
+ 2. Run `rake setup`, this will set up the `.env` file necessary to run
+    the tests and set up the database
+ 3. Run `rake db:create`, this will create the test database
+ 4. Run `rake db:migrate`, this will set up the database tables required
+    by the test
+
 ## Authors
 
 Dan McClain [twitter](http://twitter.com/_danmcclain) [github](http://github.com/danmcclain)

data/Rakefile

@@ -4,6 +4,7 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -20,14 +21,89 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task :default => :test
+
+task :setup do
+  if File.exist?('.env')
+    puts 'This will overwrite your existing .env file'
+  end
+  print 'Enter your database name: [postgres_ext_test] '
+  db_name = STDIN.gets.chomp
+  print 'Enter your database user: [] '
+  db_user = STDIN.gets.chomp
+  print 'Enter your database password: [] '
+  db_password = STDIN.gets.chomp
+  print 'Enter your database server: [localhost] '
+  db_server = STDIN.gets.chomp
+
+  db_name = 'postgres_ext_test' if db_name.empty?
+  db_password = ":#{db_password}" unless db_password.empty?
+  db_server = 'localhost' if db_server.empty?
+
+  db_server = "@#{db_server}" unless db_user.empty?
+
+  env_path = File.expand_path('./.env')
+  File.open(env_path, 'w') do |file|
+    file.puts "DATABASE_NAME=#{db_name}"
+    file.puts "DATABASE_URL=\"postgres://#{db_user}#{db_password}#{db_server}/#{db_name}\""
+  end
+
+  puts '.env file saved'
 end
 
-task :default => :spec
+namespace :db do
+  task :load_db_settings do
+    require 'active_record'
+    unless ENV['DATABASE_URL']
+      require 'dotenv'
+      Dotenv.load
+    end
+  end
+
+  task :drop => :load_db_settings do
+    %x{ dropdb #{ENV['DATABASE_NAME']} }
+  end
+
+  task :create => :load_db_settings do
+    %x{ createdb #{ENV['DATABASE_NAME']} }
+  end
+
+  task :migrate => :load_db_settings do
+    ActiveRecord::Base.establish_connection
+
+    ActiveRecord::Base.connection.create_table :people, force: true do |t|
+      t.inet     "ip"
+      t.cidr     "subnet"
+      t.integer  "tag_ids",      array: true
+      t.string   "tags",         array: true
+      t.integer  "lucky_number"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    ActiveRecord::Base.connection.create_table :people_tags, force: true do |t|
+      t.integer  "person_id"
+      t.integer  "tag_id"
+    end
+
+    ActiveRecord::Base.connection.create_table :tags, force: true do |t|
+      t.integer  "person_id"
+      t.string   "categories",         array: true
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    puts 'Database migrated'
+  end
+end

data/docs/querying.md

@@ -1,3 +1,76 @@
+# Common Table Expressions (CTEs)
+
+Postgres\_ext adds CTE expression support to ActiveRecord via two
+methods:
+
+  * [`Relation#with`](#with)
+  * [`Model.from_cte`](#from_cte)
+
+## with
+
+We can add CTEs to queries by chaining `#with` off a relation.
+`Relation#with` accepts a hash, and will convert `Relation`s to the
+proper SQL in the CTE.
+
+Let's expand a `#with` call to it's resulting SQL code:
+
+```ruby
+Score.with(my_games: Game.where(id: 1)).joins('JOIN my_games ON scores.game_id = my_games.id')
+```
+
+The following will be generated when that relation is evaluated:
+
+```SQL
+WITH my_games AS (
+SELECT games.*
+FROM games
+WHERE games.id = 1
+)
+SELECT *
+FROM scores
+JOIN my_games
+ON scores.games_id = my_games.id
+```
+
+You can also do a recursive with:
+
+```ruby
+Graph.with.recursive(search_graph:
+  "  SELECT g.id, g.link, g.data, 1 AS depth
+     FROM graph g
+   UNION ALL
+     SELECT g.id, g.link, g.data, sg.depth + 1
+     FROM graph g, search_graph sg
+     WHERE g.id = sg.link").from(:search_graph)
+```
+
+## from\_cte
+
+`Model.from_cte` is similiar to `Model.find_by_sql`, taking the CTE
+passed in, but allowing you to chain off of it further, instead of just
+retrieving the results.
+
+Take the following ActiveRecord call:
+
+```ruby
+Score.from_cte('scores_for_game', Score.where(game_id: 1)).where(user_id: 1)
+```
+
+The following SQL will be called:
+
+```SQL
+WITH scores_for_game AS (
+SELECT *
+FROM scores
+WHERE game_id = 1
+)
+SELECT *
+FROM scores_for_game
+WHERE scores_for_game.user_id = 1
+```
+
+And will be converted to `Score` objects
+
 # Querying PostgreSQL datatypes
 
   * [Arrays](#arrays)
@@ -109,16 +182,13 @@ accompish this:
 ```ruby
 user_arel = User.arel_table
 
-any_tags_function = Arel::Nodes::NamedFunction.new('ANY', [user_arel[:tags]])
-predicate = Arel::Nodes::Equality.new('test', any_tags_function)
-
 # Execute the query
-User.where(predicate)
+User.where(user_arel[:tags].any('test'))
 #=> SELECT \"users\".* FROM \"users\" WHERE 'test' = ANY(\"users\".\"tags\")
 ```
 
-The ALL version of this same predicate can be generated by swap `'ANY'`
-for `'ALL'` in the named function.
+The ALL version of this same predicate can be generated by swapping
+`#any()` for `#all()`.
 
 ## INET/CIDR Queries
 

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

@@ -8,8 +8,8 @@ module ActiveRecord
       case value
       when Array
         engine = attribute.relation.engine
-        column = engine.columns.detect{ |col| col.name == attribute.name }
-        if column.array
+        column = engine.columns.detect{ |col| col.name.to_s == attribute.name.to_s }
+        if column && column.array
           attribute.eq(value)
         else
           values = value.to_a.map {|x| x.is_a?(Base) ? x.id : x}

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

@@ -67,6 +67,21 @@ module ActiveRecord
       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
+      def initialize(scope)
+        @scope = scope
+      end
+
+      # Returns a new relation expressing WITH RECURSIVE
+      def recursive(*args)
+        @scope.with_values += args
+        @scope.recursive_value = true
+        @scope
+      end
+    end
+
     [:with].each do |name|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
        def #{name}_values                   # def select_values
@@ -80,7 +95,7 @@ module ActiveRecord
       CODE
     end
 
-    [:rank].each do |name|
+    [:rank, :recursive].each do |name|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}_value=(value)            # def readonly_value=(value)
           raise ImmutableRelation if @loaded #   raise ImmutableRelation if @loaded
@@ -93,14 +108,23 @@ module ActiveRecord
       CODE
     end
 
-    def with(*args)
-      check_if_method_has_arguments!('with', args)
-      spawn.with!(*args.compact.flatten)
+    def with(opts = :chain, *rest)
+      if opts == :chain
+        WithChain.new(spawn)
+      elsif opts.blank?
+        self
+      else
+        spawn.with!(opts, *rest)
+      end
     end
 
-    def with!(*args)
-      self.with_values += args
-      self
+    def with!(opts = :chain, *rest) # :nodoc:
+      if opts == :chain
+        WithChain.new(self)
+      else
+        self.with_values += [opts] + rest
+        self
+      end
     end
 
     def ranked(options = :order)
@@ -115,15 +139,16 @@ module ActiveRecord
     def build_arel_with_extensions
       arel = build_arel_without_extensions
 
-      build_with(arel, with_values)
+      build_with(arel)
 
       build_rank(arel, rank_value) if rank_value
 
       arel
     end
 
-    def build_with(arel, withs)
-      with_statements = withs.flat_map do |with_value|
+    def build_with(arel)
+      visitor = arel.engine.connection.visitor
+      with_statements = with_values.flat_map do |with_value|
         case with_value
         when String
           with_value
@@ -134,12 +159,20 @@ module ActiveRecord
               select = Arel::SqlLiteral.new "(#{expression})"
             when ActiveRecord::Relation
               select = Arel::SqlLiteral.new "(#{expression.to_sql})"
+            when Arel::SelectManager
+              select = Arel::SqlLiteral.new visitor.accept(expression)
             end
             as = Arel::Nodes::As.new Arel::SqlLiteral.new(name.to_s), select
           end
         end
       end
-      arel.with with_statements unless with_statements.empty?
+      unless with_statements.empty?
+        if recursive_value
+          arel.with :recursive, with_statements
+        else
+          arel.with with_statements
+        end
+      end
     end
 
     def build_rank(arel, rank_window_options)