updateable_views_inheritance 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZhMjYwNzIwZjgxZGQwNTEyOWFlN2YwYzQwNjkzYmNhZmJlZTk5Zg==
+    MDFhNTFiOTNiNDBhYjg4MzY5NTBmMWQ1MjYyMWU1MGQyMTE0OTJmYw==
   data.tar.gz: !binary |-
-    NDQ2YWIwNmNmODRkODZjNzY5N2ZhYzIxN2QwMjk1NmNmMzk5N2IwMw==
+    Y2I1NDc5YTAwNzVlMTdkODNjNjYwMmFlMjAxZDQ5MDk2ZDI4MWJkNg==
 SHA512:
   metadata.gz: !binary |-
-    NGJiODc3MWQ3MTgwMThlZTcwOGM0OWMwNzNhMTk1NzdkZjRiZjg1NTNlN2Mw
-    MDkzYzAyMTVlZWNjODE1YmU1ZWVmMDQ1Y2IzOGE3NGQ0Njc4MjUyNWYwMTRl
-    ODQwODY4NmRkZTcyMGZjMjg0MTkwMjlmZDE3NDk3NWUxZTdhMGU=
+    YzMxMjM3Y2I5MGJmMzBiN2ZjNGNiMzllOGYwMjA2ZDg0MjFlM2YxYmEzMzc5
+    OTU5M2Y5ZmUxMDJhOTUxN2NjNTlhZWNjNjU4NWUzOGM0YzgxMDg5NDRjN2Zj
+    OGJjNjYzMzlmOTVlYjlmMTMwOTRiOTZmMTJkZmY1OWViODAzZTQ=
   data.tar.gz: !binary |-
-    MTIzMWViYTE2YWEwMmUxNDY2NDc2MDAwZDFiZTI5ZjVjMzI5ZWIyNTJjM2U2
-    NDRkZTE4YzgyMWI2Mzg5NWFlY2I4NThjNDI4YzkzYjMwYWM5Y2MyNTA3NjVk
-    YTFjZmQxYTI1YTFlMTUyNDFmMThmN2NkMmRhZDE5YTg2MDU4NDY=
+    YmU5NzU4ODA5YjNiYmU3NjE1MzdjODc1NTllM2IyMDk5NDFhNDVlM2EwNDQz
+    ZTdmZGUzMDkxZGU1OTEwNWFiMGNjOTE1NGM1NDcwNGIyOTJlNGRjZGZkMzg4
+    ZmY1Njk1YmM4MDg1ODRiODNjOTY4NmJjZWZhMjVkMDdjODJiNGQ=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.1 (27 August 2014)
+
+Bugfixes:
+
+  - parent relations can be in a schema
+
 ## 1.2.0 (27 August 2014)
 
 Features:
@@ -9,7 +15,7 @@ Features:
 Bugfixes:
 
   - fixed generating migration on installation
-  
+
 Documentation:
 
   - README brought up to date
@@ -29,6 +35,6 @@ Features:
 ## 1.0.0 (14 September 2009)
 
 Features:
-  
+
   - class_table_inheritance plugin has behaved stably in production for a year
   - supports rails 2.1, 2.2 and 2.3

data/README.rdoc

@@ -2,8 +2,8 @@
 
 Class Table Inheritance for ActiveRecord using updateable views.
 
-More about the pattern on http://www.martinfowler.com/eaaCatalog/classTableInheritance.html. This gem messes very little with Rails inheritance mechanism. 
-Instead it relies on updatable views in the database to represent classes in the inheritance chain. The approach was {first suggested by John 
+More about the pattern on http://www.martinfowler.com/eaaCatalog/classTableInheritance.html. This gem messes very little with Rails inheritance mechanism.
+Instead it relies on updatable views in the database to represent classes in the inheritance chain. The approach was {first suggested by John
 Wilger}[http://web.archive.org/web/20060408145717/johnwilger.com/articles/2005/09/29/class-table-inheritance-in-rails-with-postgresql].
 
 
@@ -46,17 +46,17 @@ after every change to the class hierarchy. Otherwise tests may fail.
         t.column :max_speed, :integer
         t.column :type, :string
       end
-      
+
       create_child(:steam_locomotives, :parent => :locomotives) do |t|
         t.decimal :water_consumption, :precision => 6, :scale => 2
         t.decimal :coal_consumption,  :precision => 6, :scale => 2
       end
-      
+
       create_child(:electric_locomotives, :table => :raw_electric_locomotives, :parent => :locomotives)  do |t|
         t.decimal :electricity_consumption, :precision => 6, :scale => 2
       end
     end
-    
+
     def self.down
       drop_child  :steam_locomotives
       drop_child  :electric_locomotives
@@ -67,7 +67,7 @@ after every change to the class hierarchy. Otherwise tests may fail.
 And the models:
   class Locomotive
   end
-  
+
   class SteamLocomotive < Locomotive
     self.table_name =  :steam_locomotives
   end
@@ -87,7 +87,7 @@ Note that models of children classes must specify table name explicitly.
       rename_column(:name, :title)
       rebuild_parent_and_children_views(:locomotives)
     end
-  end 
+  end
 
 ===Renaming Underlying Tables
 
@@ -110,12 +110,12 @@ The approach of this gem is completely independent from Rails built-in Single Ta
 If you use fixtures, you must run <tt>rake updateable_views_inheritance:fixture</tt> to generate fixture for the updateable_views_inheritance table after you add/remove
 classes from the hierarchy or change underlying table or view names. <b>Without it primary key sequence for inheritors' tables won't be bumped to the max and it might not be possible to save objects!</b> If you don't use fixtures for the classes in the hierarchy you don't need to do that.
 
-This gem re-enables referential integrity on fixture loading. This means that 
+This gem re-enables referential integrity on fixture loading. This means that
 
   fixtures :all
-  
+
 may fail when there are foreign key constraints on tables. To fix this, explicitly declare fixture load order in <tt>test_helper.rb</tt>:
 
   fixtures :roots, :trunks, :leafs, ...
-  
+
 for all fixtures you want to load.

data/lib/updateable_views_inheritance/postgresql_adapter.rb

@@ -2,7 +2,7 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     class PostgreSQLAdapter
       # Use this in migration to create child table and view.
-      # Options: 
+      # Options:
       # [:parent]
       #   parent relation
       # [:child_table_name]
@@ -13,10 +13,10 @@ module ActiveRecord #:nodoc:
         schema, unqualified_child_view_name = Utils.extract_schema_and_table(child_view)
 
         parent_relation = options[:parent].to_s
-        if tables.include?(parent_relation)
-          parent_table = parent_relation
-        else # view, interpreted as inheritance chain deeper than two levels
+        if is_view?(parent_relation) # interpreted as inheritance chain deeper than two levels
           parent_table = query("SELECT child_relation FROM updateable_views_inheritance WHERE child_aggregate_view = #{quote(parent_relation)}")[0][0]
+        else
+          parent_table = parent_relation
         end
 
         child_table = options[:table] || quote_table_name("#{child_view}_data")
@@ -29,10 +29,10 @@ module ActiveRecord #:nodoc:
         execute "ALTER TABLE #{child_table} ADD PRIMARY KEY (#{child_table_pk})"
         execute "ALTER TABLE #{child_table} ADD FOREIGN KEY (#{child_table_pk})
                  REFERENCES #{parent_table} ON DELETE CASCADE ON UPDATE CASCADE"
-        
+
         create_child_view(parent_relation, child_view, child_table)
       end
-      
+
       # Drop child view and table
       def drop_child(child_view)
         drop_view(child_view)
@@ -40,7 +40,7 @@ module ActiveRecord #:nodoc:
         drop_table(child_table)
         execute "DELETE FROM updateable_views_inheritance WHERE child_aggregate_view = #{quote(child_view)}"
       end
-      
+
       # Creates aggregate updateable view of parent and child relations. The convention for naming child tables is
       # <tt>"#{child_view}_data"</tt>. If you don't follow it, supply +child_table_name+ as third argument.
       def create_child_view(parent_table, child_view, child_table=nil)
@@ -200,7 +200,7 @@ module ActiveRecord #:nodoc:
           c = columns_hash[col.name]
           if(c && col.sql_type != c.sql_type)
             conflict_column_names << col.name
-          else 
+          else
             columns_hash[col.name] = col
           end
         end
@@ -228,7 +228,7 @@ module ActiveRecord #:nodoc:
       def supports_disable_referential_integrity?
         false
       end
-      
+
       def table_exists_with_updateable_views_inheritance_support?(name)
         is_view?(name) ? true : table_exists_without_updateable_views_inheritance_support?(name)
       end
@@ -247,12 +247,12 @@ module ActiveRecord #:nodoc:
                 end
                 @@klasses.uniq
               end
-        
+
               # Returns the class object for +table_name+
               def get_klass_for_table(table_name)
                 klass_for_tables()[table_name.to_s]
               end
-        
+
               # Returns hash with tables and thier corresponding class.
               # {table_name1 => ClassName1, ...}
               def klass_for_tables
@@ -263,7 +263,7 @@ module ActiveRecord #:nodoc:
                 end
                 @@tables_klasses
               end
-              
+
               # Returns filenames for models in the current Rails application
               def model_filenames
                 Dir.chdir("#{Rails.root}/app/models"){ Dir["**/*.rb"] }
@@ -296,7 +296,7 @@ module ActiveRecord #:nodoc:
             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} 
+              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?};
@@ -320,7 +320,7 @@ module ActiveRecord #:nodoc:
               #{ parent_columns.empty? ? '':
                  "UPDATE #{parent_table}
                      SET #{ parent_columns.collect{ |col| col + "= NEW." +col }.join(", ") }
-                     WHERE #{parent_pk} = OLD.#{parent_pk};"} 
+                     WHERE #{parent_pk} = OLD.#{parent_pk};"}
               #{ child_columns.empty? ? '':
                  "UPDATE #{child_table}
                      SET #{ child_columns.collect{ |col| col + " = NEW." +col }.join(", ") }
@@ -329,7 +329,7 @@ module ActiveRecord #:nodoc:
             )
           end_sql
         end
-        
+
         def insert_returning_clause(child_view,parent_columns)
           "RETURNING "+
           columns(child_view).map do |c|
@@ -340,7 +340,7 @@ module ActiveRecord #:nodoc:
             end
           end.join(",")
         end
-        
+
         # Set default values from the table columns for a view
         def set_defaults(view_name, table_name)
           column_definitions(table_name).each do |column_name, type, default, notnull|
@@ -376,9 +376,9 @@ module ActiveRecord #:nodoc:
             res[0] if res
           end
         end
-        
+
         # Single Table Inheritance Aggregate View
-        
+
         # Nested list for the +parent_relation+ inheritance hierarchy
         # Every descendant relation is presented as an array with relation's name as first element
         # and the other elements are the relation's children presented in the same way as lists.
@@ -398,7 +398,7 @@ module ActiveRecord #:nodoc:
           end
           hierarchy
         end
-  
+
         def get_leaves_relations(hierarchy)
           return [] if hierarchy.nil? || hierarchy.empty?
           head, hierarchy = hierarchy.first, hierarchy[1..(hierarchy.size)]
@@ -410,10 +410,10 @@ module ActiveRecord #:nodoc:
             return get_leaves_relations(hierarchy).compact
           end
         end
-  
+
         def generate_single_table_inheritanche_union_clause(rel, column_names, conflict_column_names, columns_hash, quoted_inheritance_column)
           relation_columns = columns(rel).collect{|c| c.name}
-          columns_select = column_names.inject([]) do |arr, col_name| 
+          columns_select = column_names.inject([]) do |arr, col_name|
             sql_type = conflict_column_names.include?(col_name) ? 'text' : columns_hash[col_name].sql_type
             value = "NULL::#{sql_type}"
             if(relation_columns.include?(col_name))

data/lib/updateable_views_inheritance/version.rb

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

data/test/config/routes.rb

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

data/test/config/schema.rb

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

data/test/content_test.rb

@@ -11,11 +11,11 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   def teardown
     ActiveRecord::Fixtures.reset_cache
   end
-  
+
   def test_find
     locomotive =  Locomotive.find(1)
     assert locomotive.kind_of?(SteamLocomotive)
-    assert_equal %w(coal_consumption id max_speed name type water_consumption), 
+    assert_equal %w(coal_consumption id max_speed name type water_consumption),
                  locomotive.attributes.keys.sort, "Could not instantiate properly child"
   end
 
@@ -24,7 +24,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
     assert !res.rows.empty?
     assert_equal 3, res.rows.first.first.to_i
   end
-  
+
   def test_save_new
     electric_locomotive = ElectricLocomotive.new(:name=> 'BoBo', :max_speed => 40, :electricity_consumption => 12)
     assert electric_locomotive.save, "Couldn't save new"
@@ -37,14 +37,14 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
     mogul = Locomotive.find(steam_locomotive.id)
     assert mogul.kind_of?(SteamLocomotive)
   end
-  
+
   def test_update
     steam_locomotive = Locomotive.find(1)
     steam_locomotive.update_attributes( :name => 'Rocket')
     steam_locomotive.reload
     assert_equal 'Rocket', steam_locomotive.name
   end
-  
+
   def test_delete_from_parent_relation
     num_locomotives = Locomotive.count
     num_steam_locomotives = SteamLocomotive.count
@@ -52,7 +52,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
     assert_equal num_locomotives - 1, Locomotive.count
     assert_equal num_steam_locomotives - 1, SteamLocomotive.count
   end
-  
+
   def test_delete_from_child_relation
     num_locomotives = Locomotive.count
     num_steam_locomotives = SteamLocomotive.count

data/test/deep_hierarchy_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class DeepHierarchyTest < ActiveSupport::TestCase  
+class DeepHierarchyTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 8)
     # order of fixtures is important for the test - last loaded should not be with max(id)
@@ -9,27 +9,27 @@ class DeepHierarchyTest < ActiveSupport::TestCase
     end
     @connection = ActiveRecord::Base.connection
   end
-  
+
   def teardown
     ActiveRecord::Fixtures.reset_cache
   end
-  
+
   def test_deeper_hierarchy
     assert_equal [["boats"], ["railed_vehicles", ["trains", ["electric_trains", ["maglev_trains"]], ["rack_trains"], ["steam_trains"]]], ["wheeled_vehicles", ["bicycles"], ["cars"]]].sort,
                   @connection.send(:get_view_hierarchy_for, :vehicles).sort
   end
-  
+
   def test_leaves_relations
     hierarchy = @connection.send(:get_view_hierarchy_for, :vehicles)
     assert_equal %w(boats bicycles cars maglev_trains rack_trains steam_trains).sort,
                   @connection.send(:get_leaves_relations, hierarchy).sort
   end
-  
+
   def test_view_columns
     assert_equal %w(id vehicle_type name number_of_wheels number_of_doors number_of_gears number_of_rails mast_number max_speed water_consumption coal_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
       @connection.columns(:all_vehicles).collect{|c| c.name}.sort
   end
-  
+
   def test_single_table_inheritance_deeper_hierarchy_records_number
     assert_equal Vehicle.count, @connection.select_value("SELECT count(*) FROM all_vehicles").to_i
     assert_equal SteamTrain.count, @connection.select_value("SELECT count(*) FROM all_vehicles WHERE vehicle_type='SteamTrain'").to_i
@@ -40,18 +40,18 @@ class DeepHierarchyTest < ActiveSupport::TestCase
     assert_equal Bicycle.count, @connection.select_value("SELECT count(*) FROM all_vehicles WHERE vehicle_type='Bicycle'").to_i
     assert_equal Boat.count, @connection.select_value("SELECT count(*) FROM all_vehicles WHERE vehicle_type='Boat'").to_i
   end
-  
+
   def test_single_table_inheritance_deeper_hierarchy_contents
     mag = MaglevTrain.find(:first)
     assert_equal [mag.id.to_s, mag.name, mag.number_of_rails.to_s, mag.max_speed.to_s, mag.magnetic_field.to_s, (sprintf("%.2f",mag.electricity_consumption))], (@connection.query("SELECT id, name, number_of_rails, max_speed, magnetic_field, electricity_consumption FROM all_vehicles WHERE id=#{mag.id}").first)
   end
-  
+
   class OrderColumnsInAggregateView < ActiveRecord::Migration
     def self.up
       rebuild_single_table_inheritance_view(:all_vehicles,:vehicles, %w(max_speed number_of_wheels id))
     end
   end
-  
+
   def test_single_table_inheritance_view_order_view_columns
     OrderColumnsInAggregateView.up
     assert_equal %w(max_speed number_of_wheels id),

data/test/install_generator_test.rb

@@ -5,7 +5,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   destination File.join(Rails.root, "tmp")
   setup :prepare_destination
   tests UpdateableViewsInheritance::Generators::InstallGenerator
-  
+
   test "create migration" do
     run_generator
     assert_migration 'db/migrate/create_updateable_views_inheritance.rb'

data/test/schema_test.rb

@@ -1,29 +1,29 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase  
+class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 5)
     @connection = ActiveRecord::Base.connection
   end
-  
+
   def test_pk_and_sequence_for
     assert_equal ['id', 'public.locomotives_id_seq'], @connection.pk_and_sequence_for(:maglev_locomotives), "Could not get pk and sequence for child aggregate view"
   end
-  
+
   def test_primary_key
     assert_equal 'id', @connection.primary_key(:maglev_locomotives), "Wrong or no primary key for child aggregate view"
   end
-  
-  
+
+
   def test_content_columns
     assert !SteamLocomotive.content_columns.include?("id")
   end
-  
+
   def test_views
-    assert_equal ["electric_locomotives", "maglev_locomotives", "rack_locomotives", "steam_locomotives"], 
+    assert_equal ["electric_locomotives", "maglev_locomotives", "rack_locomotives", "steam_locomotives"],
                  @connection.views.sort
   end
-  
+
   class ParentTableWithOnlyOneColumn < ActiveRecord::Migration
     def self.up
       create_table(:parent_pk_only){}
@@ -33,13 +33,13 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       create_child_view :parent_pk_only, :child
     end
   end
-  
+
   def test_parent_table_with_only_one_column
     ParentTableWithOnlyOneColumn.up
     assert @connection.views.include?('child')
     assert_equal %w(id name), @connection.columns(:child).map{|c| c.name}.sort
   end
-  
+
   class ChildTableWithOnlyOneColumn < ActiveRecord::Migration
     def self.up
       create_table :parent do |t|
@@ -49,22 +49,22 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       create_child_view :parent, :child_pk_only
     end
   end
-  
+
   def test_child_table_with_only_one_column
     ChildTableWithOnlyOneColumn.up
     assert @connection.views.include?('child_pk_only'), "Could not create child view when child table has only one column"
     assert_equal %w(id name), @connection.columns(:child_pk_only).map{|c| c.name}.sort
   end
-  
+
   def test_serial_pk_has_default_in_view
     assert_equal %q|nextval('locomotives_id_seq'::regclass)|,
                  @connection.query(<<-end_sql, 'Serial PK has default in view')[0][0]
                    SELECT pg_catalog.pg_get_expr(d.adbin, d.adrelid) as constraint
                      FROM pg_catalog.pg_attrdef d, pg_catalog.pg_attribute a, pg_catalog.pg_class c
-                    WHERE d.adrelid = a.attrelid 
-                      AND d.adnum = a.attnum 
-                      AND a.atthasdef 
-                      AND c.relname = 'maglev_locomotives' 
+                    WHERE d.adrelid = a.attrelid
+                      AND d.adnum = a.attnum
+                      AND a.atthasdef
+                      AND c.relname = 'maglev_locomotives'
                       AND a.attrelid = c.oid
                       AND a.attname = 'id'
                       AND a.attnum > 0 AND NOT a.attisdropped
@@ -75,12 +75,12 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
     RackLocomotive.reset_column_information
     assert_equal 'Abt', RackLocomotive.new.rail_system
   end
-  
+
   def test_default_value_boolean_of_view_column
     assert !RackLocomotive.new.bidirectional
     assert RackLocomotive.new.narrow_gauge
   end
-    
+
   class ChangeDefaultValueOfColumn < ActiveRecord::Migration
     def self.up
       remove_parent_and_children_views(:rack_locomotives)
@@ -88,24 +88,24 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       rebuild_parent_and_children_views(:rack_locomotives)
     end
   end
-  
+
   def test_change_default_value_of_column
     ChangeDefaultValueOfColumn.up
     RackLocomotive.reset_column_information
     assert_equal 'Marsh', RackLocomotive.new.rail_system
   end
-  
+
   class RemoveChildrenViews < ActiveRecord::Migration
     def self.up
       remove_parent_and_children_views(:locomotives)
     end
   end
-    
+
   def test_remove_parent_and_children_views
     RemoveChildrenViews.up
     assert @connection.views.empty?
   end
-    
+
   class RemoveColumnInParentTable < ActiveRecord::Migration
     def self.up
       remove_parent_and_children_views(:locomotives)
@@ -113,7 +113,7 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       rebuild_parent_and_children_views(:locomotives)
     end
   end
-  
+
   def test_remove_column_parent_table
     RemoveColumnInParentTable.up
     assert_equal %w(coal_consumption id name type water_consumption),
@@ -121,7 +121,7 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
     assert_equal %w(electricity_consumption id magnetic_field name type),
                  @connection.columns(:maglev_locomotives).map{ |c| c.name }.sort
   end
-  
+
   class RenameColumnInParentTable < ActiveRecord::Migration
     def self.up
       ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
@@ -140,25 +140,25 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
                  @connection.columns(:steam_locomotives).map{ |c| c.name }.sort
     assert_equal %w(electricity_consumption id magnetic_field maximal_speed name type),
                  @connection.columns(:maglev_locomotives).map{ |c| c.name }.sort
-    
+
   end
-  
+
   class AddColumnToParentTable < ActiveRecord::Migration
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       rebuild_parent_and_children_views(:electric_locomotives)
     end
   end
-  
+
   def test_add_column_to_parent_table
     AddColumnToParentTable.up
     assert_equal %w(electricity_consumption id max_speed name number_of_engines type),
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
     assert_equal %w(electricity_consumption id magnetic_field max_speed name number_of_engines type),
                  @connection.columns(:maglev_locomotives).map{ |c| c.name }.sort
-    
+
   end
-  
+
   class ChangeChildRelationView < ActiveRecord::Migration
     def self.up
       remove_parent_and_children_views(:electric_locomotives)
@@ -166,13 +166,13 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       rebuild_parent_and_children_views(:electric_locomotives)
     end
   end
-  
+
   def test_change_child_relation_view
     ChangeChildRelationView.up
     assert_equal %w(electric_consumption id max_speed name type),
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
   end
-  
+
   def test_table_exists
     #TODO: test table_exists? monkey patch
   end
@@ -180,7 +180,12 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
   class CreateChildInSchema < ActiveRecord::Migration
     def self.up
       execute "CREATE SCHEMA interrail"
-      create_child("interrail.steam_locomotives", :parent => :locomotives) do |t|
+      create_table 'interrail.locomotives' do |t|
+        t.column :interrail_name, :string
+        t.column :interrail_max_speed, :integer
+        t.column :type, :string
+      end
+      create_child('interrail.steam_locomotives', :parent => 'interrail.locomotives') do |t|
         t.decimal :interrail_water_consumption, :precision => 6, :scale => 2
         t.decimal :interrail_coal_consumption,  :precision => 6, :scale => 2
       end
@@ -189,7 +194,12 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
 
   def test_create_child_in_schema
     CreateChildInSchema.up
-    assert_equal %w(id interrail_coal_consumption interrail_water_consumption max_speed name type),
+    assert_equal %w(id
+                    interrail_coal_consumption
+                    interrail_max_speed
+                    interrail_name
+                    interrail_water_consumption
+                    type),
                  @connection.columns('interrail.steam_locomotives').map{ |c| c.name }.sort
   end
 end

data/test/single_table_inheritance.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase  
+class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 6)
     # order of fixtures is important for the test - last loaded should not be with max(id)
@@ -9,13 +9,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     end
     @connection = ActiveRecord::Base.connection
   end
-  
+
   def test_single_table_inheritance_view_schema
     @connection = ActiveRecord::Base.connection
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
-  
+
   def test_single_table_inheritance_records_number
     assert_equal Locomotive.count, @connection.query("SELECT count(*) FROM all_locomotives").first.first.to_i
     assert_equal SteamLocomotive.count, @connection.query("SELECT count(*) FROM all_locomotives WHERE type='SteamLocomotive'").first.first.to_i
@@ -23,13 +23,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     assert_equal RackLocomotive.count, @connection.query("SELECT count(*) FROM all_locomotives WHERE type='RackLocomotive'").first.first.to_i
     assert_equal MaglevLocomotive.count, @connection.query("SELECT count(*) FROM all_locomotives WHERE type='MaglevLocomotive'").first.first.to_i
   end
-  
+
   def test_single_table_inheritance_save
     electric_locomotive = ElectricLocomotive.new(:name=> 'BoBo', :max_speed => 40, :electricity_consumption => 12)
     assert electric_locomotive.save
     assert_equal electric_locomotive.name, @connection.query("SELECT name FROm all_locomotives WHERE id=#{electric_locomotive.id}").first.first
   end
-  
+
   class AddColumnToParentTable < ActiveRecord::Migration
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
@@ -38,13 +38,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
       create_single_table_inheritance_view(:all_locomotives, :locomotives)
     end
   end
-  
+
   def test_single_table_inheritance_view_add_column_to_parent_table
     AddColumnToParentTable.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
-  
+
   class RemoveColumnInParentTable < ActiveRecord::Migration
     def self.up
       drop_view(:all_locomotives)
@@ -54,20 +54,20 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
       create_single_table_inheritance_view(:all_locomotives,:locomotives)
     end
   end
-  
+
   def test_single_table_inheritance_view_remove_column_parent_table
     RemoveColumnInParentTable.up
     assert_equal %w(coal_consumption id name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
-  
+
   class RenameColumnInParentTable < ActiveRecord::Migration
     def self.up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:locomotives)
       rename_column(:locomotives, :max_speed, :maximal_speed)
       rebuild_parent_and_children_views(:locomotives)
-      create_single_table_inheritance_view(:all_locomotives, :locomotives) 
+      create_single_table_inheritance_view(:all_locomotives, :locomotives)
     end
   end
 
@@ -76,7 +76,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     assert_equal %w(coal_consumption id maximal_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
-  
+
   class ChangeChildRelationView < ActiveRecord::Migration
     def self.up
       drop_view(:all_locomotives)
@@ -86,13 +86,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
       create_single_table_inheritance_view(:all_locomotives, :locomotives)
     end
   end
-  
+
   def test_single_table_inheritance_view_change_child_relation_view
     ChangeChildRelationView.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electric_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
-  
+
   class ConflictColumns < ActiveRecord::Migration
     def self.up
       drop_view(:all_locomotives)
@@ -103,14 +103,14 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
       create_single_table_inheritance_view(:all_locomotives, :locomotives)
     end
   end
-  
+
   def test_single_table_inheritance_view_conflict_columns
     ConflictColumns.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
     assert_equal 'text', @connection.columns(:all_locomotives).detect{|c| c.name == "number_of_engines"}.sql_type
   end
-  
+
   class ConflictColumnsWithValues < ActiveRecord::Migration
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
@@ -123,7 +123,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
       create_single_table_inheritance_view(:all_locomotives, :locomotives)
     end
   end
-  
+
   def test_single_table_inheritance_view_conflict_columns_with_values
     ConflictColumnsWithValues.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,
@@ -132,7 +132,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     assert_equal 'one', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{SteamLocomotive.find(:first).id}").first.first
     assert_equal '2', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{ElectricLocomotive.find(:first).id}").first.first
   end
-  
+
   def test_respond_to_missing_attributes
     Locomotive.table_name = :all_locomotives
     assert !MaglevLocomotive.new.respond_to?(:non_existing_attribute_in_the_hierarchy), "Active Record is gone haywire - responds to attributes that are never defined"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: updateable_views_inheritance
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sava Chankov