schema_qualified_tables 1.1.0 → 1.1.1

data/CHANGELOG.markdown

@@ -1,6 +1,11 @@
 schema_qualified_tables history
 ===============================
 
+1.1.1
+-----
+
+- Don't prepend the schema if it is already present in AR 3.2. (#8, #9)
+
 1.1.0
 -----
 

data/README.markdown

@@ -13,6 +13,7 @@ For example
 
 Say you have an application using a legacy schema that has models like this:
 
+    # Rails 2.3, 3.0 and 3.1
     class Surgery < ActiveRecord::Base
       belongs_to :surgeon, :class_name => "Person", :foreign_key => "surgeon_id"
       set_table_name "t_surgeries"
@@ -22,6 +23,16 @@ Say you have an application using a legacy schema that has models like this:
       set_table_name "hr.t_personnel"
     end
 
+    # Rails 3.2+
+    class Surgery < ActiveRecord::Base
+      belongs_to :surgeon, :class_name => "Person", :foreign_key => "surgeon_id"
+      self.table_name = "t_surgeries"
+    end
+
+    class Person < ActiveRecord::Base
+      self.table_name = "hr.t_personnel"
+    end
+
 These models map to tables in two schemas: the default schema, which
 contains `t_surgeries`; and the schema `hr`, which contains
 `t_personnel`.
@@ -45,17 +56,21 @@ logical schema name for your models which is resolved into the actual
 schema name based on runtime configuration.  In this case, you'd
 re-write `Person` like so:
 
+    # Rails 2.3, 3.0 and 3.1
     class Person < ActiveRecord::Base
       set_schema :hr
       set_table_name :t_personnel
     end
 
-    # For Rails 3.2+ this syntax is also supported
+    # Rails 3.2+
     class Person < ActiveRecord::Base
       self.schema = :hr
       self.table_name = :t_personnel
     end
 
+(Please note: The deprecated-in-Rails-3.2 syntax `set_table_name` and
+`set_sequence_name` _does not work_ with schema qualified tables in Rails 3.2.)
+
 Then, if you need to override the actual schema name in some
 environments, configure `ActiveRecord::Base.schemas`:
 

data/lib/bcdatabase/active_record/schema_qualified_tables/version.rb

@@ -1,7 +1,7 @@
 module Bcdatabase
   module ActiveRecord
     module SchemaQualifiedTables
-      VERSION = '1.1.0'
+      VERSION = '1.1.1'
     end
   end
 end

data/lib/bcdatabase/active_record/schema_qualified_tables_override_getters.rb

@@ -22,20 +22,20 @@ module Bcdatabase
 
         def table_name
           unless abstract_class?
-            if schema_name
-              "#{schema_name}.#{super}"
-            else
+            if schema_name_prepended?(schema_name, super)
               super
+            else
+              "#{schema_name}.#{super}"
             end
           end
         end
 
         def sequence_name
           unless abstract_class?
-            if schema_name && (super =~ /^#{schema_name}\./).nil?
-              "#{schema_name}.#{super}"
-            else
+            if schema_name_prepended?(schema_name, super)
               super
+            else
+              "#{schema_name}.#{super}"
             end
           end
         end
@@ -51,6 +51,10 @@ module Bcdatabase
 
         protected
 
+        def schema_name_prepended?(name, super_klass)
+          !(name && (super_klass =~ /^#{name}\./).nil?)
+        end
+
         def schema_name
           ::ActiveRecord::Base.schemas[self.schema] || self.schema
         end
@@ -59,4 +63,4 @@ module Bcdatabase
   end
 end
 
-::ActiveRecord::Base.send(:include, Bcdatabase::ActiveRecord::SchemaQualifiedTables)
+::ActiveRecord::Base.send(:include, Bcdatabase::ActiveRecord::SchemaQualifiedTables)

data/spec/bcdatabase/active_record/schema_qualified_tables_spec.rb

@@ -24,7 +24,7 @@ describe "SchemaQualifiedTables" do
 
   after do
     Object.class_eval do
-      %w(ReadingMaterialBase Book Magazine Newspaper Pamphlet).each do |clazz|
+      %w(ReadingMaterialBase Book Magazine Newspaper Pamphlet AnotherMagazine).each do |clazz|
         remove_const clazz if const_defined? clazz
       end
     end
@@ -150,6 +150,17 @@ describe "SchemaQualifiedTables" do
           Magazine.table_name.should == "periodicals.some_magazines"
           Newspaper.table_name.should == "deprecated.newspapers"
         end
+
+        it "prepends the schema name only once when inheriting a table name" do
+          class Magazine < ReadingMaterialBase
+            sqt_table_name("some_magazines")
+          end
+
+          class AnotherMagazine < Magazine
+          end
+
+          AnotherMagazine.table_name.should == "reading_material.some_magazines"
+        end
       end
 
       describe "with name overrides" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_qualified_tables
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,18 +143,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3344378071871990966
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3344378071871990966
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24