rasti-db 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab65952edd3d755127be36c3e95655fcf230900
-  data.tar.gz: 58e110b0bc077663cc4ca7b8f2a53167c68bf8e0
+  metadata.gz: e82be256b84a31356c81f62ce16b00a0fa576d23
+  data.tar.gz: e44de553c36041c9f572f3506ff427b68dd77142
 SHA512:
-  metadata.gz: 2d880a6ab0e060fc7917a980249be459f209e11d607ecf79289cb7d68f05dff209476502da842613a9d434503282d20f2bba78fbe5fd4f51986fa650e6d9bc29
-  data.tar.gz: cffd9d898ceaac6aa3a316e4a9d34249549e008cb7ba43d2945d55c2d8beb6bc1c66abf84cafae95ccaf7ed88fbd7f70dea4d0610e282d0e95269e335763270b
+  metadata.gz: 807edc88d2733aa2bc1ba8253596fbc3c6ba8f0e4ae4ac72c156b2f856afbcad5c71035172cc3459176264fb39dcc6447c117afbbe309e260f3c56e7b0b9f6a8
+  data.tar.gz: 8252f75a29543c6e08608753d9ceca667a70ec2c7d05df73a880f1e48922f85b83f25796f37e70f42d95d60f2848b950893491eb0dd0ec938c054ff3b24adc56

data/lib/rasti/db/collection.rb

@@ -191,7 +191,7 @@ module Rasti
       end
 
       def qualified_collection_name
-        schema.nil? ? self.class.collection_name : Sequel.qualify(schema, self.class.collection_name)
+        schema.nil? ? self.class.collection_name : Sequel[schema][self.class.collection_name]
       end
       
       def build_query(filter=nil, &block)

data/lib/rasti/db/helpers.rb

@@ -7,8 +7,8 @@ module Rasti
         private
 
         def with_schema(table, field=nil)
-          qualified_table = schema ? Sequel.qualify(schema, table) : table
-          field ? Sequel.qualify(qualified_table, field) : qualified_table
+          qualified_table = schema ? Sequel[schema][table] : table
+          field ? Sequel[qualified_table][field] : qualified_table
         end
 
       end

data/lib/rasti/db/query.rb

@@ -19,7 +19,7 @@ module Rasti
       end
 
       def pluck(*attributes)
-        ds = dataset.select(*attributes.map { |attr| Sequel.qualify(collection_class.collection_name, attr) })
+        ds = dataset.select(*attributes.map { |attr| Sequel[collection_class.collection_name][attr] })
         attributes.count == 1 ? ds.map { |r| r[attributes.first] } : ds.map(&:values)
       end
 

data/lib/rasti/db/relations.rb

@@ -125,7 +125,7 @@ module Rasti
         end
 
         def qualified_relation_collection_name(schema=nil)
-          schema.nil? ? relation_collection_name : Sequel.qualify(schema, relation_collection_name)
+          schema.nil? ? relation_collection_name : Sequel[schema][relation_collection_name]
         end
 
         def graph_to(rows, db, schema=nil, relations=[])
@@ -137,7 +137,7 @@ module Rasti
 
           join_rows = target_collection.dataset
                                        .join(relation_name, target_foreign_key => target_collection_class.primary_key)
-                                       .where(Sequel.qualify(relation_name, source_foreign_key) => pks)
+                                       .where(Sequel[relation_name][source_foreign_key] => pks)
                                        .all
 
           Relations.graph_to join_rows, relations, target_collection_class, db, schema

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/collection_spec.rb

@@ -208,16 +208,16 @@ describe 'Collection' do
         db[:users].where(id: 1).count.must_equal 1
         db[:comments].where(user_id: 1).count.must_equal 3
         db[:posts].where(user_id: 1).count.must_equal 3
-        db[:comments].join(:posts, id: :post_id).where(Sequel.qualify(:posts, :user_id) => 1).count.must_equal 3
-        db[:categories_posts].join(:posts, id: :post_id).where(Sequel.qualify(:posts, :user_id) => 1).count.must_equal 3
+        db[:comments].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 3
+        db[:categories_posts].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 3
 
         users.delete_cascade 1
 
         db[:users].where(id: 1).count.must_equal 0
         db[:comments].where(user_id: 1).count.must_equal 0
         db[:posts].where(user_id: 1).count.must_equal 0
-        db[:comments].join(:posts, id: :post_id).where(Sequel.qualify(:posts, :user_id) => 1).count.must_equal 0
-        db[:categories_posts].join(:posts, id: :post_id).where(Sequel.qualify(:posts, :user_id) => 1).count.must_equal 0
+        db[:comments].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 0
+        db[:categories_posts].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 0
         
         db[:users].count.must_equal 2
         db[:categories].count.must_equal 3

data/spec/minitest_helper.rb

@@ -45,7 +45,7 @@ class Comments < Rasti::DB::Collection
   many_to_one :post
 
   def posts_commented_by(user_id)
-    dataset.where(Sequel.qualify(:comments, :user_id) => user_id)
+    dataset.where(Sequel[:comments][:user_id] => user_id)
            .join(with_schema(:posts), id: :post_id)
            .select_all(with_schema(:posts))
            .map { |row| Post.new row }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gabriel Naiman