activerecord_pg_stuff 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e0fe7a1df9305832a41d308d6aba130aec4fb1
-  data.tar.gz: 8b5558b5366becdfb1fe1ec0ff77f312ab048e42
+  metadata.gz: 0a74e9ffd6c02c6912d7ef455e31425fdfbe19b0
+  data.tar.gz: dedb60e87ec990e25177ebb59df69ba36217f8d4
 SHA512:
-  metadata.gz: 8e20d0174e3ae5d40106b3453807871e7433c02bfdc92dcf25ccf8bfb80fd9fe5a2300053081eb1951d4013a2d91682e1823c25ff1e0597be37318b9957af228
-  data.tar.gz: bd22ac3135004e020aeec70bbc4ada73170473dbf790fe6a8d223688d5c36e6f7d9113961871f41ae6dc819eb4fc8c22b9f69e6d20a09747b905c184fb9cd909
+  metadata.gz: bac00e46e4bbcfdd35a953b1d0e1c666cc2bb18a832efd7339702e68826a82cd0fca7aa7818633e5148a2631b98f01d1ff1f4bc44fe40d3cc543e05340f345ca
+  data.tar.gz: 8c8f62c55499ce6ae9567e0311913444e6cb3c7a7929ff3dabdb64f7d0fd44604dbfe0776b1fe081d3a1552ed8789890bc91c649795ea989469f2b0f8b5f7426

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
-- 1.9.3
-- 2.0.0
+- 2.2.2
 
 env:
   global:

data/activerecord_pg_stuff.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 4.0"
+  spec.add_runtime_dependency "activerecord", "~> 5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/activerecord_pg_stuff/connection/temporary_table.rb

@@ -8,7 +8,7 @@ module ActiveRecordPgStuff
           begin
             sql = sql.gsub(/\n/, ' ').gsub(/ +/, ' ').strip
             sql = "CREATE TEMPORARY TABLE #{name} ON COMMIT DROP AS #{sql}"
-            conn.execute sql
+            execute sql
             yield name
           ensure
             execute("DROP TABLE IF EXISTS #{name}") rescue nil

data/lib/activerecord_pg_stuff/relation/pivot.rb

@@ -17,7 +17,7 @@ module ActiveRecordPgStuff
         def result_to_array(result)
           result.to_hash.map do |h|
             result.columns.inject([]) do |a, col|
-              a << result.column_types[col].type_cast(h[col])
+              a << result.column_types[col].cast(h[col])
             end
           end
         end
@@ -26,8 +26,7 @@ module ActiveRecordPgStuff
     module Pivot
 
       def pivot(row_id, col_id, val_id)
-
-        types_sql = %{ SELECT column_name, data_type FROM information_schema.columns WHERE table_name = #{connection.quote self.table_name} AND column_name IN (#{connection.quote row_id},#{connection.quote val_id}) }
+        types_sql = %{ SELECT column_name, data_type FROM information_schema.columns WHERE table_name = #{connection.quote self.table.name} AND column_name IN (#{connection.quote row_id},#{connection.quote val_id}) }
         types = connection.select_all types_sql
         types = types.to_a.map(&:values).inject({}) do |a, v|
           a[v[0]] = v[1]

data/lib/activerecord_pg_stuff/relation/temporary_table.rb

@@ -4,13 +4,15 @@ module ActiveRecordPgStuff
     module TemporaryTable
 
       class Decorator
-        attr_reader :table_name, :arel_table, :quoted_table_name
+        attr_reader :table_name, :arel_table, :quoted_table_name, :table_metadata, :predicate_builder
 
         def initialize(object, table_name)
           @table_name        = table_name
           @object            = object
           @arel_table        = Arel::Table.new(table_name)
           @quoted_table_name = @object.connection.quote_table_name(table_name)
+          @table_metadata    = ActiveRecord::TableMetadata.new(self, @arel_table)
+          @predicate_builder = ActiveRecord::PredicateBuilder.new(@table_metadata)
         end
 
         def method_missing(name, *args, &block)
@@ -23,10 +25,10 @@ module ActiveRecordPgStuff
       end
 
       def temporary_table
-        tname = "temporary_#{self.table_name}_#{self.object_id}"
+        tname = "temporary_#{self.table.name}_#{self.object_id}"
         self.klass.connection.with_temporary_table tname, self.to_sql do |name|
           dec     = Decorator.new self.klass, name
-          rel     = ActiveRecord::Relation.new dec, dec.arel_table
+          rel     = ActiveRecord::Relation.new dec, table: dec.arel_table
           rel.readonly!
           yield rel
         end

data/lib/activerecord_pg_stuff/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordPgStuff
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/connection_temporary_table_spec.rb

@@ -9,7 +9,7 @@ describe ActiveRecordPgStuff::Connection::TemporaryTable do
       rs = conn.with_temporary_table 'sellers_tmp', sql do |name|
         conn.select_all("SELECT * FROM #{name}").to_a.map(&:values)
       end
-      expect(rs).to eq [%w{1 foo}, %w{2 bar}]
+      expect(rs).to eq [[1, "foo"], [2, "bar"]]
       expect {
         conn.execute 'SELECT * FROM sellers_tmp'
       }.to raise_error(ActiveRecord::StatementInvalid, /PG::UndefinedTable/)
@@ -22,7 +22,7 @@ describe ActiveRecordPgStuff::Connection::TemporaryTable do
           conn.select_all("SELECT * FROM #{name_nested}").to_a.map(&:values)
         end
       end
-      expect(rs).to eq [%w{1 foo}]
+      expect(rs).to eq [[1, "foo"]]
       expect {
         conn.execute 'SELECT * FROM sellers_tmp'
       }.to raise_error(ActiveRecord::StatementInvalid, /PG::UndefinedTable/)

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_pg_stuff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ' Adds support for working with temporary tables and pivot tables (PostgreSQL
-  only) '
+description: " Adds support for working with temporary tables and pivot tables (PostgreSQL
+  only) "
 email:
 - dima.exe@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Adds support for working with temporary tables and pivot tables (PostgreSQL