updateable_views_inheritance 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.2 (18 August 2015)
+
+Bugfixes:
+
+  - fixed compatibility with Rails 3.2.19+ and ActiveRecord's prepared statements
+
 ## 1.2.1 (27 August 2014)
 
 Bugfixes:

data/Gemfile

@@ -3,4 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in updateable_views_inheritance.gemspec
 gemspec
 
-gem 'debugger'
+if RUBY_VERSION > "2"
+  gem 'byebug'
+else
+  gem 'debugger'
+end
+

data/README.rdoc

@@ -25,11 +25,6 @@ Run
 
 * In <tt>Gemfile</tt> add <tt>gem 'updateable_views_inheritance'</tt>
 * Run <tt>rails generate updateable_views_inheritance:install && rake db:migrate</tt>
-* In <tt>config/database.yml</tt> аdd to every environment
-
-    prepared_statements: false
-
-ActiveRecord's postgresql adapter has subtle problems with prepared statements that cause strange errors every now and then.
 * In <tt>config/environment.rb</tt> set <tt>config.active_record.schema_format = :sql</tt>
 * In case you're using fixtures, don't forget to run
 
@@ -118,4 +113,9 @@ may fail when there are foreign key constraints on tables. To fix this, explicit
 
   fixtures :roots, :trunks, :leafs, ...
 
-for all fixtures you want to load.
+for all fixtures you want to load.
+
+==Gem Development & Testing
+
+The gem has a comprehensive test suite. In order to run it, your user must be a superuser in PostgreSQL.
+If this is not the case, run <tt>createuser -s pesho</tt> (assuming your Unix account is <tt>pesho</tt>).

data/Rakefile

@@ -24,12 +24,12 @@ end
 namespace :test do
   desc 'Build the test database'
   task :create_database do
-    %x( createdb -U postgres updateable_views_inheritance_test )
+    %x( createdb updateable_views_inheritance_test )
   end
 
   desc 'Drop the test database'
-  task :drop_database do 
-    %x( dropdb  -U postgres updateable_views_inheritance_test )
+  task :drop_database do
+    %x( dropdb updateable_views_inheritance_test )
   end
 
   desc 'Rebuild the test database'

data/lib/updateable_views_inheritance/postgresql_adapter.rb

@@ -111,7 +111,7 @@ module ActiveRecord #:nodoc:
           parent = parent_table(relation)
           pk_and_sequence_for(parent) if parent
         else
-          # log(result[0], "PK for #{relation}")
+          # log(result[0], "PK for #{relation}") {}
           [result[0], query("SELECT pg_get_serial_sequence('#{relation}', '#{result[0]}') ")[0][0]]
         end
       rescue
@@ -295,14 +295,13 @@ module ActiveRecord #:nodoc:
           execute <<-end_sql
             CREATE OR REPLACE RULE #{quote_column_name("#{child_view}_insert")} AS
             ON INSERT TO #{child_view} DO INSTEAD (
-              SELECT setval('#{parent_pk_seq}', NEW.#{parent_pk});
               INSERT INTO #{parent_table}
                      ( #{ [parent_pk, parent_columns].flatten.join(", ") } )
-                     VALUES( currval('#{parent_pk_seq}') #{ parent_columns.empty? ? '' : ',' + parent_columns.collect{ |col| "NEW." + col}.join(",") } )
-                     #{insert_returning_clause(child_view, parent_columns.unshift(parent_pk)) if supports_insert_with_returning?};
+                     VALUES( DEFAULT #{ parent_columns.empty? ? '' : ' ,' + parent_columns.collect{ |col| "NEW." + col}.join(", ") } ) ;
               INSERT INTO #{child_table}
                      ( #{ [child_pk, child_columns].flatten.join(",")} )
-                     VALUES( currval('#{parent_pk_seq}') #{ child_columns.empty? ? '' : ',' + child_columns.collect{ |col| "NEW." + col}.join(",") }  )
+                     VALUES( currval('#{parent_pk_seq}') #{ child_columns.empty? ? '' : ' ,' + child_columns.collect{ |col| "NEW." + col}.join(", ") }  )
+                     #{insert_returning_clause(parent_pk, child_pk, child_view) if supports_insert_with_returning?}
             )
           end_sql
 
@@ -330,15 +329,12 @@ module ActiveRecord #:nodoc:
           end_sql
         end
 
-        def insert_returning_clause(child_view,parent_columns)
-          "RETURNING "+
-          columns(child_view).map do |c|
-            if parent_columns.include?(c.name)
-              c.name
-            else
-              "CAST (NULL AS #{c.sql_type})"
-            end
-          end.join(",")
+        def insert_returning_clause(parent_pk, child_pk, child_view)
+          columns_cast_to_null = columns(child_view)
+                                  .reject { |c| c.name == parent_pk}
+                                  .map { |c| "CAST (NULL AS #{c.sql_type})" }
+                                  .join(", ")
+          "RETURNING #{child_pk}, #{columns_cast_to_null}"
         end
 
         # Set default values from the table columns for a view

data/lib/updateable_views_inheritance/version.rb

@@ -1,3 +1,3 @@
 module UpdateableViewsInheritance
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/content_test.rb

@@ -3,9 +3,6 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 5)
-    # order of fixtures is important for the test - last loaded should not be with max(id)
-    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
-    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
   end
 
   def teardown
@@ -13,6 +10,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_find
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     locomotive =  Locomotive.find(1)
     assert locomotive.kind_of?(SteamLocomotive)
     assert_equal %w(coal_consumption id max_speed name type water_consumption),
@@ -20,8 +18,31 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_exec_query
-    res = ActiveRecord::Base.connection.exec_query(%q{INSERT INTO electric_locomotives (electricity_consumption, max_speed, name, type) VALUES (40, 120, 'test', 'ElectricLocomotive') RETURNING id})
-    assert !res.rows.empty?
+    # order of fixtures is important for the test - last loaded should not be with max(id)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
+
+    res = ActiveRecord::Base.connection.exec_query(<<-SQL)
+      INSERT INTO electric_locomotives (electricity_consumption, max_speed, name, type)
+        VALUES (40, 120, 'BoBo', 'ElectricLocomotive') RETURNING id
+    SQL
+    assert !res.rows.empty?, 'No id returned on INSERT in database view'
+    assert_equal 3, res.rows.first.first.to_i
+  end
+
+  def test_exec_query_with_prepared_statement
+    # order of fixtures is important for the test - last loaded should not be with max(id)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
+
+    binds = [[ElectricLocomotive.columns.find { |c| c.name == 'electricity_consumption'}, 40],
+             [ElectricLocomotive.columns.find { |c| c.name == 'max_speed'},              120],
+             [ElectricLocomotive.columns.find { |c| c.name == 'name'},                'BoBo'],
+             [ElectricLocomotive.columns.find { |c| c.name == 'type'},  'ElectricLocomotive']]
+    res = ActiveRecord::Base.connection.exec_query(<<-SQL, 'Test prepared statement', binds)
+      INSERT INTO electric_locomotives (electricity_consumption, max_speed, name, type) VALUES ($1, $2, $3, $4) RETURNING id
+    SQL
+    assert !res.rows.empty?, 'Empty result on INSERT in database view through a prepared statement'
     assert_equal 3, res.rows.first.first.to_i
   end
 
@@ -32,6 +53,9 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_reset_sequence_after_loading_fixture
+    # order of fixtures is important for the test - last loaded should not be with max(id)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     steam_locomotive = SteamLocomotive.new(:name => 'Mogul', :max_speed => 120, :water_consumption => 12.3, :coal_consumption => 54.6)
     assert steam_locomotive.save
     mogul = Locomotive.find(steam_locomotive.id)
@@ -39,6 +63,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_update
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     steam_locomotive = Locomotive.find(1)
     steam_locomotive.update_attributes( :name => 'Rocket')
     steam_locomotive.reload
@@ -46,6 +71,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_delete_from_parent_relation
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     num_locomotives = Locomotive.count
     num_steam_locomotives = SteamLocomotive.count
     Locomotive.find(1).destroy
@@ -54,13 +80,11 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   end
 
   def test_delete_from_child_relation
+    ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     num_locomotives = Locomotive.count
     num_steam_locomotives = SteamLocomotive.count
     SteamLocomotive.find(1).destroy
     assert_equal num_locomotives - 1, Locomotive.count
     assert_equal num_steam_locomotives - 1, SteamLocomotive.count
   end
-
-
-
 end

data/test/dummy/config/database.yml

@@ -1,7 +1,4 @@
 test:
   adapter: postgresql
-  username: postgres
-  password: postgres
   database: updateable_views_inheritance_test
   min_messages: ERROR
-  prepared_statements: false

data/test/pg_insert_returning_with_rules_spec.rb

@@ -0,0 +1,58 @@
+gem "pg", "0.18.2"
+
+require "pg"
+require "rspec"
+
+describe "Insert returning on view with rules and default value" do
+  before(:each) do
+    @conn = PG.connect(dbname: 'updateable_views_inheritance_test')
+    @conn.exec(%q{ SET client_min_messages TO 'ERROR' })
+
+    @conn.exec(%q{ CREATE TABLE parent ( id SERIAL PRIMARY KEY,
+                                         name TEXT) })
+    @conn.exec(%q{ CREATE TABLE child ( parent_id INTEGER PRIMARY KEY REFERENCES parent(id),
+                                        surname TEXT) })
+
+    @conn.exec(%q{ CREATE VIEW v AS (SELECT id, name, surname FROM parent JOIN child ON parent.id=child.parent_id) })
+    @conn.exec(%q{ ALTER VIEW v ALTER id SET DEFAULT nextval('parent_id_seq'::regclass) })
+    #
+    # The old way that didn't return anything when binds are empty
+    #
+    # @conn.exec(%q{ CREATE RULE v_on_insert AS ON INSERT TO v DO INSTEAD
+    #               (
+    #                 SELECT setval('parent_id_seq', NEW.id);
+    #                 INSERT INTO parent (id, name)
+    #                   VALUES( currval('parent_id_seq'), NEW.name ) RETURNING id, name, NULL::text;
+    #                 INSERT INTO child  (parent_id, surname)
+    #                   VALUES( currval('parent_id_seq'), NEW.surname );
+    #
+    #               )
+    #             })
+    @conn.exec(%q{ CREATE RULE v_on_insert AS ON INSERT TO v DO INSTEAD
+                  (
+                    INSERT INTO parent (id, name)
+                      VALUES( DEFAULT, NEW.name );
+                    INSERT INTO child  (parent_id, surname)
+                      VALUES( currval('parent_id_seq'), NEW.surname ) RETURNING parent_id, NULL::text, NULL::te;
+                  )
+                })
+
+    @sql = %q{ INSERT INTO v (name, surname) VALUES ('parent', 'child') RETURNING id}
+  end
+
+  after(:each) do
+    @conn.exec(%q{ DROP VIEW IF EXISTS v })
+    @conn.exec(%q{ DROP TABLE IF EXISTS parent CASCADE})
+    @conn.exec(%q{ DROP TABLE IF EXISTS child CASCADE})
+  end
+
+  it 'async exec with empty binds' do
+    res = @conn.async_exec(@sql, [])
+    expect(res.values).to eq([["1"]])
+  end
+
+  it 'async exec with no binds' do
+    res = @conn.async_exec(@sql)
+    expect(res.values).to eq([["1"]])
+  end
+end

data/test/test_helper.rb

@@ -6,7 +6,11 @@ require 'rails/test_help'
 require 'updateable_views_inheritance'
 
 begin
-  require 'ruby-debug'
+  if RUBY_VERSION > "2"
+    require 'byebug'
+  else
+    require 'debugger'
+  end
 rescue LoadError
   # no debugger available
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: updateable_views_inheritance
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Sava Chankov
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,10 +115,6 @@ files:
 - lib/updateable_views_inheritance/postgresql_adapter.rb
 - lib/updateable_views_inheritance/version.rb
 - tasks/updateable_views_inheritance_tasks.rake
-- test/config/database.yml
-- test/config/environment.rb
-- test/config/routes.rb
-- test/config/schema.rb
 - test/content_test.rb
 - test/deep_hierarchy_test.rb
 - test/dummy/Rakefile
@@ -176,6 +183,7 @@ files:
 - test/fixtures/steam_trains.yml
 - test/install_generator_test.rb
 - test/migration_test.rb
+- test/pg_insert_returning_with_rules_spec.rb
 - test/schema_test.rb
 - test/single_table_inheritance.rb
 - test/test_helper.rb
@@ -183,32 +191,29 @@ files:
 homepage: http://github.com/tutuf/updateable_views_inheritance
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Class table inheritance for ActiveRecord
 test_files:
-- test/config/database.yml
-- test/config/environment.rb
-- test/config/routes.rb
-- test/config/schema.rb
 - test/content_test.rb
 - test/deep_hierarchy_test.rb
 - test/dummy/Rakefile
@@ -277,6 +282,7 @@ test_files:
 - test/fixtures/steam_trains.yml
 - test/install_generator_test.rb
 - test/migration_test.rb
+- test/pg_insert_returning_with_rules_spec.rb
 - test/schema_test.rb
 - test/single_table_inheritance.rb
 - test/test_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDFhNTFiOTNiNDBhYjg4MzY5NTBmMWQ1MjYyMWU1MGQyMTE0OTJmYw==
-  data.tar.gz: !binary |-
-    Y2I1NDc5YTAwNzVlMTdkODNjNjYwMmFlMjAxZDQ5MDk2ZDI4MWJkNg==
-SHA512:
-  metadata.gz: !binary |-
-    YzMxMjM3Y2I5MGJmMzBiN2ZjNGNiMzllOGYwMjA2ZDg0MjFlM2YxYmEzMzc5
-    OTU5M2Y5ZmUxMDJhOTUxN2NjNTlhZWNjNjU4NWUzOGM0YzgxMDg5NDRjN2Zj
-    OGJjNjYzMzlmOTVlYjlmMTMwOTRiOTZmMTJkZmY1OWViODAzZTQ=
-  data.tar.gz: !binary |-
-    YmU5NzU4ODA5YjNiYmU3NjE1MzdjODc1NTllM2IyMDk5NDFhNDVlM2EwNDQz
-    ZTdmZGUzMDkxZGU1OTEwNWFiMGNjOTE1NGM1NDcwNGIyOTJlNGRjZGZkMzg4
-    ZmY1Njk1YmM4MDg1ODRiODNjOTY4NmJjZWZhMjVkMDdjODJiNGQ=

data/test/config/database.yml

@@ -1,19 +0,0 @@
-test:
-  adapter: sqlite3
-  dbfile: test.sqlite3.db
-
-#  adapter: sqlite
-#  dbfile: test.sqlite.db
-
-#  adapter: mysql
-#  host: localhost
-#  username:
-#  password:
-#  database: test
-
-#  adapter: postgresql
-#  host: localhost
-#  username:
-#  password:
-#  database: test
-

data/test/config/environment.rb

@@ -1,14 +0,0 @@
-
-Rails::Initializer.run do |config|
-
-  config.cache_classes = true
-
-  config.whiny_nils = true
-
-  config.action_controller.consider_all_requests_local = true
-  config.action_controller.perform_caching             = false
-
-  config.action_mailer.delivery_method = :test
-  config.action_mailer.perform_deliveries = true
-
-end

data/test/config/routes.rb

@@ -1,3 +0,0 @@
-ActionController::Routing::Routes.draw do |map|
-
-end

data/test/config/schema.rb

@@ -1,3 +0,0 @@
-ActiveRecord::Schema.define(:version => 2) do
-
-end