rasti-db 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa66e94f3945ca058846ce6031b4720516d58646
-  data.tar.gz: 87e086acc3972e6a553aea23e9741a8d74235022
+  metadata.gz: 2ab65952edd3d755127be36c3e95655fcf230900
+  data.tar.gz: 58e110b0bc077663cc4ca7b8f2a53167c68bf8e0
 SHA512:
-  metadata.gz: 6d0add21909af7df516237b904484e65b68042ec9da5f792ecc4c517a63d175fc98a19389ee2ca063f8a028457e9fd0adab0c2f4a46ea323ea93ab3148be8030
-  data.tar.gz: db6e89b5c05617e65aaa07dab882de5376acf0dd3bda0d94001eaf5e24f482772b1fb3d8617c8647aeb72e26aeb5d62ccf15706ab3ea6617872adc0bccc696e7
+  metadata.gz: 2d880a6ab0e060fc7917a980249be459f209e11d607ecf79289cb7d68f05dff209476502da842613a9d434503282d20f2bba78fbe5fd4f51986fa650e6d9bc29
+  data.tar.gz: cffd9d898ceaac6aa3a316e4a9d34249549e008cb7ba43d2945d55c2d8beb6bc1c66abf84cafae95ccaf7ed88fbd7f70dea4d0610e282d0e95269e335763270b

data/lib/rasti/db/query.rb

@@ -2,7 +2,7 @@ module Rasti
   module DB
     class Query
 
-      DATASET_CHAINED_METHODS = [:where, :exclude, :and, :or, :order, :reverse_order, :limit, :offset].freeze
+      DATASET_CHAINED_METHODS = [:where, :exclude, :or, :order, :reverse_order, :limit, :offset].freeze
 
       include Enumerable
       include Helpers::WithSchema

data/lib/rasti/db/version.rb

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

data/rasti-db.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'sequel', '~> 4.38'
+  spec.add_runtime_dependency 'sequel', '~> 5.0'
   spec.add_runtime_dependency 'consty', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'

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(posts__user_id: 1).count.must_equal 3
-        db[:categories_posts].join(:posts, id: :post_id).where(posts__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
 
         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(posts__user_id: 1).count.must_equal 0
-        db[:categories_posts].join(:posts, id: :post_id).where(posts__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[: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(comments__user_id: user_id)
+    dataset.where(Sequel.qualify(:comments, :user_id) => user_id)
            .join(with_schema(:posts), id: :post_id)
            .select_all(with_schema(:posts))
            .map { |row| Post.new row }

data/spec/query_spec.rb

@@ -49,7 +49,7 @@ describe 'Query' do
   end
   
   it 'And' do
-    users_query.where(id: [1,2]).and(name: 'User 2').all.must_equal [User.new(id: 2, name: 'User 2')]
+    users_query.where(id: [1,2]).where(name: 'User 2').all.must_equal [User.new(id: 2, name: 'User 2')]
   end
   
   it 'Or' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.38'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.38'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: consty
   requirement: !ruby/object:Gem::Requirement