activerecord-hierarchical_query 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51bb399108f367e30e8bde8ea46171451212228
-  data.tar.gz: 385d34aa8caa4777f50e0a2c8a7b9d84c0c30dd1
+  metadata.gz: b3857ae3686fc8bc70d3fa51f68ce8b179c74565
+  data.tar.gz: 8ff21aff761065bdc8fe7af742607a53f1488b7f
 SHA512:
-  metadata.gz: d3bad1f4d790f159e86c1870184e43afc7b3c196394b8330d52b8cd25a582ba098b609cf2193213017838fb426f2cdebf22c53ce8b372bb211cb272c95bd7332
-  data.tar.gz: 02b43b6cfb15595885d4d326b6ddd6cced8c34fc7d8dff3c7c1aa11eca5119852276b7d3238f78f13f6634bc9fd62b8e5eaf72505a30aff1f201d4c50d60b731
+  metadata.gz: 47ba81111606890e77d4decb8b1dcb8e9f10ae0ff985b74aab7309133c159294227bed679b7d748ee644aa4646fac8eb29404bee0cdfede1689f15a35dded15b
+  data.tar.gz: 2d474936f08750e56f9a467d07ef8bc110e099154907f260f31f579ffed75690c9f70c384e6ca3cc48bb61f56706a26ef1f06298808a1fba77cec5576b66f0ca

data/README.md

@@ -65,7 +65,7 @@ crumbs = records.pluck(:name).join(' / ')
 
 ## Requirements
 
-* ActiveRecord >= 3.1.0 (Rails 4.2 included)
+* ActiveRecord >= 3.1.0 (Rails 5.0 not supported yet)
 * PostgreSQL >= 8.4
 
 ## Installation

data/lib/active_record/hierarchical_query/orderings.rb

@@ -101,7 +101,12 @@ module ActiveRecord
         table = order_attribute.relation
 
         if table.engine == ActiveRecord::Base
-          columns = table.engine.connection_pool.columns_hash[table.name]
+          columns =
+            if table.engine.connection.respond_to?(:schema_cache)
+              table.engine.connection.schema_cache.columns_hash(table.name)
+            else
+              table.engine.connection_pool.columns_hash[table.name]
+            end
         else
           columns = table.engine.columns_hash
         end
@@ -110,4 +115,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/active_record/hierarchical_query/query.rb

@@ -253,7 +253,7 @@ module ActiveRecord
       #
       # @return [Arel::Table]
       def prior
-        @recursive_table ||= Arel::Table.new("#{table.name}__recursive")
+        @recursive_table ||= Arel::Table.new("#{normalized_table_name}__recursive")
       end
       alias_method :previous, :prior
       alias_method :recursive_table, :prior
@@ -308,7 +308,7 @@ module ActiveRecord
         raise 'Recursive query requires CONNECT BY clause, please use #connect_by method' unless
             connect_by_value
 
-        table_alias = join_options.fetch(:as, "#{table.name}__recursive")
+        table_alias = join_options.fetch(:as, "#{normalized_table_name}__recursive")
 
         JoinBuilder.new(self, relation, table_alias, join_options).build
       end
@@ -325,6 +325,10 @@ module ActiveRecord
           end.reduce(:and)
         end
       end
+
+      def normalized_table_name
+        table.name.gsub('.', '_')
+      end
     end # class Builder
   end # module HierarchicalQuery
 end # module ActiveRecord

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/activerecord-hierarchical_query.rb

@@ -0,0 +1 @@
+require 'active_record/hierarchical_query'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - lib/active_record/hierarchical_query/orderings.rb
 - lib/active_record/hierarchical_query/query.rb
 - lib/active_record/hierarchical_query/version.rb
+- lib/activerecord-hierarchical_query.rb
 - lib/arel/nodes/postgresql.rb
 - spec/active_record/hierarchical_query_spec.rb
 - spec/database.travis.yml