updateable_views_inheritance 1.1.2 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmZhMjYwNzIwZjgxZGQwNTEyOWFlN2YwYzQwNjkzYmNhZmJlZTk5Zg==
+  data.tar.gz: !binary |-
+    NDQ2YWIwNmNmODRkODZjNzY5N2ZhYzIxN2QwMjk1NmNmMzk5N2IwMw==
+SHA512:
+  metadata.gz: !binary |-
+    NGJiODc3MWQ3MTgwMThlZTcwOGM0OWMwNzNhMTk1NzdkZjRiZjg1NTNlN2Mw
+    MDkzYzAyMTVlZWNjODE1YmU1ZWVmMDQ1Y2IzOGE3NGQ0Njc4MjUyNWYwMTRl
+    ODQwODY4NmRkZTcyMGZjMjg0MTkwMjlmZDE3NDk3NWUxZTdhMGU=
+  data.tar.gz: !binary |-
+    MTIzMWViYTE2YWEwMmUxNDY2NDc2MDAwZDFiZTI5ZjVjMzI5ZWIyNTJjM2U2
+    NDRkZTE4YzgyMWI2Mzg5NWFlY2I4NThjNDI4YzkzYjMwYWM5Y2MyNTA3NjVk
+    YTFjZmQxYTI1YTFlMTUyNDFmMThmN2NkMmRhZDE5YTg2MDU4NDY=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0 (27 August 2014)
+
+Features:
+
+  - support for PostgreSQL schemas
+
 ## 1.1.2 (14 June 2013)
 
 Bugfixes:

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in updateable_views_inheritance.gemspec
 gemspec
+
+gem 'debugger'

data/README.rdoc

@@ -110,7 +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, so if you are using foreign keys you will have to explicitly declare fixture load order in test_helper.rb, for
-example:
+This gem re-enables referential integrity on fixture loading. This means that 
 
-  fixtures(:roots, :trunks, :leafs, ...)
+  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

@@ -9,15 +9,19 @@ module ActiveRecord #:nodoc:
       #   default is <tt>"#{child_view}_data"</tt>
       def create_child(child_view, options)
         raise 'Please call me with a parent, for example: create_child(:steam_locomotives, :parent => :locomotives)' unless options[:parent]
+
+        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
           parent_table = query("SELECT child_relation FROM updateable_views_inheritance WHERE child_aggregate_view = #{quote(parent_relation)}")[0][0]
         end
-        child_table = options[:table] || "#{child_view}_data"
-        child_table_pk = "#{child_view.singularize}_id"
-        
+
+        child_table = options[:table] || quote_table_name("#{child_view}_data")
+        child_table_pk = "#{unqualified_child_view_name.singularize}_id"
+
         create_table(child_table, :id => false) do |t|
           t.integer child_table_pk, :null => false
           yield t
@@ -58,8 +62,8 @@ module ActiveRecord #:nodoc:
         make_child_view_updateable(parent_table, parent_column_names, parent_pk, parent_pk_seq, child_view, child_column_names, child_pk, child_table)
 
         # assign default values for table columns on the view - it is not automatic in Postgresql 8.1
-        set_defaults(child_view, parent_table, parent_columns)
-        set_defaults(child_view, child_table, child_columns)
+        set_defaults(child_view, parent_table)
+        set_defaults(child_view, child_table)
         create_system_table_records(parent_table, child_view, child_table)
       end
 
@@ -288,8 +292,8 @@ module ActiveRecord #:nodoc:
           # insert
           # NEW.#{parent_pk} can be explicitly specified and when it is null every call to it increments the sequence.
           # Setting the sequence to its value (explicitly supplied or the default) covers both cases.
-          execute <<-end_sql  
-            CREATE OR REPLACE RULE #{child_view}_insert AS
+          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} 
@@ -304,14 +308,14 @@ module ActiveRecord #:nodoc:
 
           # delete
           execute <<-end_sql
-           CREATE OR REPLACE RULE #{child_view}_delete AS
+           CREATE OR REPLACE RULE #{quote_column_name("#{child_view}_delete")} AS
            ON DELETE TO #{child_view} DO INSTEAD
            DELETE FROM #{parent_table} WHERE #{parent_pk} = OLD.#{parent_pk}
           end_sql
 
           # update
           execute <<-end_sql
-            CREATE OR REPLACE RULE #{child_view}_update AS
+            CREATE OR REPLACE RULE #{quote_column_name("#{child_view}_update")} AS
             ON UPDATE TO #{child_view} DO INSTEAD (
               #{ parent_columns.empty? ? '':
                  "UPDATE #{parent_table}
@@ -338,34 +342,14 @@ module ActiveRecord #:nodoc:
         end
         
         # Set default values from the table columns for a view
-        def set_defaults(view_name, table_name, columns)
-          columns.each do |column| 
-            if !(default_value = get_default_value(table_name, column.name)).nil?
-              execute("ALTER TABLE #{view_name} ALTER #{column.name} SET DEFAULT #{default_value}") 
+        def set_defaults(view_name, table_name)
+          column_definitions(table_name).each do |column_name, type, default, notnull|
+            if !default.nil?
+              execute("ALTER TABLE #{quote_table_name(view_name)} ALTER #{quote_column_name(column_name)} SET DEFAULT #{default}")
             end
           end
         end
 
-        # ActiveRecord::ConnectionAdapters::Column objects have nil default value for serial primary key
-        def get_default_value(table_name, column_name)
-          result = query(<<-end_sql, 'Column default value')[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 = '#{table_name}' 
-               AND a.attrelid = c.oid
-               AND a.attname = '#{column_name}'
-               AND a.attnum > 0 AND NOT a.attisdropped
-          end_sql
-          if !result.nil? && !result.empty?
-            result[0]
-          else
-            nil
-          end
-        end
-
         def create_system_table_records(parent_relation, child_aggregate_view, child_relation)
           parent_relation, child_aggregate_view, child_relation = [parent_relation, child_aggregate_view, child_relation].collect{|rel| quote(rel.to_s)}
           exists = query <<-end_sql

data/lib/updateable_views_inheritance/version.rb

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

data/test/schema_test.rb

@@ -176,4 +176,20 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
   def test_table_exists
     #TODO: test table_exists? monkey patch
   end
+
+  class CreateChildInSchema < ActiveRecord::Migration
+    def self.up
+      execute "CREATE SCHEMA interrail"
+      create_child("interrail.steam_locomotives", :parent => :locomotives) do |t|
+        t.decimal :interrail_water_consumption, :precision => 6, :scale => 2
+        t.decimal :interrail_coal_consumption,  :precision => 6, :scale => 2
+      end
+    end
+  end
+
+  def test_create_child_in_schema
+    CreateChildInSchema.up
+    assert_equal %w(id interrail_coal_consumption interrail_water_consumption max_speed name type),
+                 @connection.columns('interrail.steam_locomotives').map{ |c| c.name }.sort
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: updateable_views_inheritance
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Sava Chankov
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,27 +183,26 @@ 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: 1.8.25
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Class table inheritance for ActiveRecord
 test_files:
 - test/config/database.yml
@@ -292,4 +280,3 @@ test_files:
 - test/schema_test.rb
 - test/single_table_inheritance.rb
 - test/test_helper.rb
-has_rdoc: