pg_ltree 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30020b7ecfe41a351064635d06a2c06ae10feb96
-  data.tar.gz: '04917a96c6a478f59a1fcf0ff5ac2f6f08632d56'
+  metadata.gz: f2b26d6c59f672404d75047f8111c4279ba48997
+  data.tar.gz: 01e1adf826c8d150d244102a3db4c374b18cefb4
 SHA512:
-  metadata.gz: ddc2d2a0dbfee906646a9ebcb0beec03e30cbe0416535d5829c48913d8a5c6f1d29df9ba00aa8c141b2af0129d4f9a62d81b94dcda64d70d53bfeaf3114f9083
-  data.tar.gz: c9d0cc4a179dab9a8f1d45fad7c7d4954cfbdd1c79970db9248d184f4094b52412ae9a52b0f437aa623ecb75c91c8d5127bf74fb03e9aff2906187186bebcf41
+  metadata.gz: 2594e997cde3d85f712b3a635c55a00384e3191e34b86c0463677a1df7e57523fab057d24f6d5f4009bcc9ef5f9b999f462bc57bf6501ec30c6ffb0a7ff4cbe3
+  data.tar.gz: 2304afa590efe9ba7ae065f37b74479ddfe331661d95291361c773bce97c1d06b7023455d488b196a9cc4b1b276700067cc2882db0604423ff080b4af3129895

data/lib/pg_ltree/ltree.rb

@@ -37,7 +37,7 @@ module PgLtree
       # @param depth [Integer] Depth of the nodes
       # @return [ActiveRecord::Relation] relations of nodes for the depth
       def at_depth(depth)
-        where "NLEVEL(#{ltree_path_column}) = ?", depth
+        where "NLEVEL(#{table_name}.#{ltree_path_column}) = ?", depth
       end
 
       # Get all leaves
@@ -57,7 +57,7 @@ module PgLtree
       # @param lquery [String] ltree query
       # @return [ActiveRecord::Relation] relations of node'
       def where_path_liked(lquery)
-        where "#{ltree_path_column} ~ ?", lquery
+        where "#{table_name}.#{ltree_path_column} ~ ?", lquery
       end
 
       # Get all nodes with path matching full-text-search-like pattern
@@ -65,7 +65,7 @@ module PgLtree
       # @param ltxtquery [String] ltree search query
       # @return [ActiveRecord::Relation] of matching nodes
       def where_path_matches_ltxtquery(ltxtquery)
-        where "#{ltree_path_column} @ ?", ltxtquery
+        where "#{table_name}.#{ltree_path_column} @ ?", ltxtquery
       end
     end
 
@@ -129,21 +129,21 @@ module PgLtree
       #
       # return [Object] root node
       def root
-        ltree_scope.where("#{ltree_path_column} = SUBPATH(?, 0, 1)", ltree_path).first
+        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} = SUBPATH(?, 0, 1)", ltree_path).first
       end
 
       # Get parent of the node
       #
       # return [Object] root node
       def parent
-        ltree_scope.find_by "#{ltree_path_column} = SUBPATH(?, 0, NLEVEL(?) - 1)", ltree_path, ltree_path
+        ltree_scope.find_by "#{ltree_scope.table_name}.#{ltree_path_column} = SUBPATH(?, 0, NLEVEL(?) - 1)", ltree_path, ltree_path
       end
 
       # Get leaves of the node
       #
       # @return [ActiveRecord::Relation]
       def leaves
-        ltree_scope.leaves.where("#{ltree_path_column} <@ ?", ltree_path).where.not ltree_path_column => ltree_path
+        ltree_scope.leaves.where("#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path).where.not ltree_path_column => ltree_path
       end
 
       # Check what current node have leaves
@@ -157,7 +157,7 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def self_and_ancestors
-        ltree_scope.where("#{ltree_path_column} @> ?", ltree_path)
+        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} @> ?", ltree_path)
       end
 
       # Get ancestors
@@ -171,7 +171,7 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def self_and_descendants
-        ltree_scope.where("#{ltree_path_column} <@ ?", ltree_path)
+        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path)
       end
 
       # Get self and descendants
@@ -202,7 +202,7 @@ module PgLtree
       # @return [ActiveRecord::Relation]
       def self_and_siblings
         ltree_scope.where(
-          "SUBPATH(?, 0, NLEVEL(?) - 1) @> #{ltree_path_column} AND nlevel(#{ltree_path_column}) = NLEVEL(?)",
+          "SUBPATH(?, 0, NLEVEL(?) - 1) @> #{ltree_scope.table_name}.#{ltree_path_column} AND nlevel(#{ltree_scope.table_name}.#{ltree_path_column}) = NLEVEL(?)",
           ltree_path, ltree_path, ltree_path
         )
       end
@@ -218,7 +218,7 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def children
-        ltree_scope.where "? @> #{ltree_path_column} AND nlevel(#{ltree_path_column}) = NLEVEL(?) + 1",
+        ltree_scope.where "? @> #{ltree_scope.table_name}.#{ltree_path_column} AND nlevel(#{ltree_scope.table_name}.#{ltree_path_column}) = NLEVEL(?) + 1",
                           ltree_path, ltree_path
       end
 
@@ -226,7 +226,7 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def cascade_update
-        ltree_scope.where(["#{ltree_path_column} <@ ?", ltree_path_was]).where(["#{ltree_path_column} != ?", ltree_path])
+        ltree_scope.where(["#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_was]).where(["#{ltree_scope.table_name}.#{ltree_path_column} != ?", ltree_path])
                    .update_all ["#{ltree_path_column} = ? || subpath(#{ltree_path_column}, nlevel(?))", ltree_path, ltree_path_was]
       end
 
@@ -234,7 +234,7 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def cascade_destroy
-        ltree_scope.where("#{ltree_path_column} <@ ?", ltree_path_was).delete_all
+        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_was).delete_all
       end
     end
   end

data/lib/pg_ltree/version.rb

@@ -3,5 +3,5 @@
 # @author a.ponomarenko
 module PgLtree
   # Gem Version
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_ltree
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Andrei Panamarenka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -165,9 +165,9 @@ signing_key:
 specification_version: 4
 summary: Organise ActiveRecord model into a tree structure with PostgreSQL LTree
 test_files:
-- test/database.yml
 - test/database.yml.sample
-- test/pg_ltree/ltree_test.rb
-- test/pg_ltree/scoped_for_test.rb
 - test/pg_ltree_test.rb
+- test/database.yml
+- test/pg_ltree/scoped_for_test.rb
+- test/pg_ltree/ltree_test.rb
 - test/test_helper.rb