rasti-db 2.2.0 → 3.0.0

data/lib/rasti/db/type_converters/postgres_types/jsonb.rb

@@ -3,36 +3,39 @@ module Rasti
     module TypeConverters
       module PostgresTypes
         class JSONB
-
           class << self
 
-            def column_type_regex
-              /^jsonb$/
+            DB_TYPE_REGEX = /^jsonb$/
+
+            def to_db?(type)
+              !type.match(DB_TYPE_REGEX).nil?
             end
 
-            def to_db(value, sub_type)
+            def to_db(value, type)
               Sequel.pg_jsonb value
             end
 
-            def db_classes
-              @db_classes ||= from_db_convertions.keys
+            def from_db?(klass)
+              to_hash?(klass) || to_array?(klass)
             end
 
-            def from_db(object)
-              object.public_send from_db_convertions[object.class]
+            def from_db(value)
+              to_hash?(value.class) ? value.to_h : value.to_a
             end
 
             private
 
-            def from_db_convertions
-              @from_db_convertions ||= {
-                Sequel::Postgres::JSONBHash => :to_h,
-                Sequel::Postgres::JSONBArray => :to_a
-              }
+            def to_hash?(klass)
+              defined?(Sequel::Postgres::JSONBHash) &&
+              klass == Sequel::Postgres::JSONBHash
             end
 
-          end
+            def to_array?(klass)
+              defined?(Sequel::Postgres::JSONBArray) &&
+              klass == Sequel::Postgres::JSONBArray
+            end
 
+          end
         end
       end
     end

data/lib/rasti/db/type_converters/sqlite.rb

@@ -0,0 +1,62 @@
+module Rasti
+  module DB
+    module TypeConverters
+      class SQLite
+
+        CONVERTERS = [SQLiteTypes::Array]
+
+        @to_db_mapping = {}
+
+        class << self
+
+          def to_db(db, collection_name, attribute_name, value)
+            to_db_mapping = to_db_mapping_for db, collection_name
+
+            if to_db_mapping.key? attribute_name
+              to_db_mapping[attribute_name][:converter].to_db value
+            else
+              value
+            end
+          end
+
+          def from_db(object)
+            converter = find_converter_from_db object
+            if !converter.nil?
+              converter.from_db object
+            else
+              object
+            end
+          end
+
+          private
+
+          def to_db_mapping_for(db, collection_name)
+            key = [db.opts[:database], collection_name]
+
+            @to_db_mapping[key] ||= begin
+              columns = Hash[db.schema(collection_name)]
+
+              columns.each_with_object({}) do |(name, schema), hash|
+                CONVERTERS.each do |converter|
+                  unless hash.key? name
+                    match = converter.column_type_regex.match schema[:db_type]
+
+                    hash[name] = { converter: converter } if match
+                  end
+                end
+              end
+            end
+          end
+
+          def find_converter_from_db(object)
+            CONVERTERS.find do |converter|
+              converter.respond_for? object
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/db/type_converters/sqlite_types/array.rb

@@ -0,0 +1,34 @@
+module Rasti
+  module DB
+    module TypeConverters
+      module SQLiteTypes
+        class Array
+
+          class << self
+
+            def column_type_regex
+              /^([a-z]+)\[\]$/
+            end
+
+            def to_db(values)
+              JSON.dump(values)
+            end
+
+            def respond_for?(object)
+              parsed = JSON.parse object
+              object == to_db(parsed)
+            rescue
+              false
+            end
+
+            def from_db(object)
+              JSON.parse object
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/type_converters/time_in_zone.rb

@@ -6,7 +6,7 @@ module Rasti
         class << self
 
           def to_db(db, collection_name, attribute_name, value)
-            value
+            value.is_a?(Timing::TimeInZone) ? value.to_time : value
           end
 
           def from_db(value)

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '2.2.0'
+    VERSION = '3.0.0'
   end
 end

data/rasti-db.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sequel', '~> 5.0'
+  spec.add_runtime_dependency 'rasti-model', '~> 1.0'
   spec.add_runtime_dependency 'treetop', '~> 1.4.8'
   spec.add_runtime_dependency 'consty', '~> 1.0', '>= 1.0.3'
   spec.add_runtime_dependency 'timing', '~> 0.1', '>= 0.1.3'
@@ -26,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_require', '~> 1.0'
   spec.add_runtime_dependency 'hierarchical_graph', '~> 1.0'
   spec.add_runtime_dependency 'hash_ext', '~> 0.5'
+  spec.add_runtime_dependency 'inflecto', '~> 0.0'
 
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'

data/spec/collection_spec.rb

@@ -2,6 +2,14 @@ require 'minitest_helper'
 
 describe 'Collection' do
 
+  before do
+    Rasti::DB.type_converters = [Rasti::DB::TypeConverters::TimeInZone]
+  end
+
+  after do
+    Rasti::DB.type_converters = [Rasti::DB::TypeConverters::TimeInZone, Rasti::DB::TypeConverters::SQLite]
+  end
+
   describe 'Specification' do
 
     it 'Implicit' do
@@ -44,7 +52,7 @@ describe 'Collection' do
     it 'Insert with many to many' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(2) do |i| 
+      1.upto(2) do |i|
         db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1
         db[:categories].insert name: "Category #{i}"
       end
@@ -57,7 +65,7 @@ describe 'Collection' do
     end
 
     it 'Insert only many to many' do
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:categories].insert name: "Category #{i}"
       end
 
@@ -93,7 +101,7 @@ describe 'Collection' do
     it 'Update with many to many' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1
         db[:categories].insert name: "Category #{i}"
       end
@@ -107,11 +115,11 @@ describe 'Collection' do
       posts.update 1, categories: [2,3]
 
       db[:categories_posts].where(post_id: 1).map(:category_id).must_equal [2,3]
-      
+
       db[:categories_posts].where(category_id: 2).map(:post_id).must_equal [1,2]
 
       categories.update 2, posts: [2,3]
-      
+
       db[:categories_posts].where(category_id: 2).map(:post_id).must_equal [2,3]
     end
 
@@ -137,7 +145,7 @@ describe 'Collection' do
     end
 
     it 'Delete only many to many' do
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:categories].insert name: "Category #{i}"
       end
 
@@ -164,14 +172,14 @@ describe 'Collection' do
         1.upto(3) do |i|
           user_id = db[:users].insert name: "User #{i}"
 
-          db[:people].insert document_number: "document_#{i}", 
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
                              user_id: user_id
 
-          category_id = db[:categories].insert name: "Category #{i}" 
-          
+          category_id = db[:categories].insert name: "Category #{i}"
+
           1.upto(3) do |n|
             post_id = db[:posts].insert user_id: user_id, title: "Post #{i}.#{n}", body: '...', language_id: 1
             db[:categories_posts].insert post_id: post_id, category_id: category_id
@@ -219,7 +227,7 @@ describe 'Collection' do
         db[:posts].where(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[:people].count.must_equal 2
         db[:categories].count.must_equal 3
@@ -233,9 +241,9 @@ describe 'Collection' do
     describe 'Multiple data sources' do
 
       before do
-        1.upto(3) do |i| 
+        1.upto(3) do |i|
           db[:users].insert name: "User #{i}"
-          db[:people].insert document_number: "document_#{i}", 
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
@@ -295,7 +303,7 @@ describe 'Collection' do
 
     it 'Find' do
       id = db[:users].insert name: 'User 1'
-      
+
       users.find(id).must_equal User.new(id: id, name: 'User 1')
     end
 
@@ -402,26 +410,26 @@ describe 'Collection' do
 
         1.upto(2) do |i|
           db[:categories].insert name: "Category #{i}"
-          
+
           db[:users].insert name: "User #{i}"
-          
-          db[:people].insert document_number: "document_#{i}", 
+
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
                              user_id: i
-          
+
         end
 
         db[:languages_people].insert language_id: 1, document_number: 'document_1'
         db[:languages_people].insert language_id: 2, document_number: 'document_2'
 
-        1.upto(3) do |i| 
+        1.upto(3) do |i|
           db[:posts].insert user_id: 1, title: "Post #{i}", body: '...', language_id: 1
           db[:categories_posts].insert category_id: 1, post_id: i
         end
-        
-        4.upto(5) do |i| 
+
+        4.upto(5) do |i|
           db[:posts].insert user_id: 2, title: "Post #{i}", body: '...', language_id: 2
           db[:categories_posts].insert category_id: 2, post_id: i
         end
@@ -467,7 +475,7 @@ describe 'Collection' do
       it 'Global' do
         result_1 = posts.created_by(1)
         result_1.primary_keys.must_equal [1,2,3]
-        
+
         result_2 = posts.created_by(2)
         result_2.primary_keys.must_equal [4,5]
       end
@@ -482,7 +490,7 @@ describe 'Collection' do
     it 'Graph' do
       1.upto(3) do |i|
         db[:users].insert name: "User #{i}"
-        db[:people].insert document_number: "document_#{i}", 
+        db[:people].insert document_number: "document_#{i}",
                            first_name: "John #{i}",
                            last_name: "Doe #{i}",
                            birth_date: Time.now - i,
@@ -513,10 +521,10 @@ describe 'Collection' do
 
         comment.post_id.must_equal 1
         comment.user_id.must_equal i
-        
+
         comment.user.id.must_equal i
         comment.user.name.must_equal "User #{i}"
-        
+
         comment.user.posts.count.must_equal 1
         comment.user.posts[0].id.must_equal i
         comment.user.posts[0].title.must_equal "Post #{i}"
@@ -536,7 +544,7 @@ describe 'Collection' do
       stubs = Proc.new do |sql|
         case sql
 
-        when 'SELECT users.* FROM schema_1.users', 
+        when 'SELECT users.* FROM schema_1.users',
              'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))'
           [
             {id: 1},
@@ -580,7 +588,7 @@ describe 'Collection' do
       Sequel.mock fetch: stubs, autoid: autoid
     end
 
-    let :stub_environment do 
+    let :stub_environment do
       Rasti::DB::Environment.new default: Rasti::DB::DataSource.new(stub_db, :schema_1),
                                  custom: Rasti::DB::DataSource.new(stub_db, :schema_2)
     end
@@ -619,7 +627,7 @@ describe 'Collection' do
 
       stub_users.insert name: 'User 1'
 
-      stub_people.insert document_number: 'document_1', 
+      stub_people.insert document_number: 'document_1',
                          first_name: 'John',
                          last_name: 'Doe',
                          birth_date: Time.parse('2020-04-24'),
@@ -672,7 +680,7 @@ describe 'Collection' do
 
       stub_db.sqls.must_equal [
         'SELECT posts.* FROM schema_1.posts',
-        'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))', 
+        'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))',
         'SELECT comments.* FROM schema_1.comments WHERE (comments.post_id IN (3, 4))',
         'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))',
         'SELECT posts.* FROM schema_1.posts WHERE (posts.user_id IN (1, 2))',

data/spec/minitest_helper.rb

@@ -10,12 +10,13 @@ require 'sequel/extensions/pg_array'
 require 'sequel/extensions/pg_json'
 
 Rasti::DB.configure do |config|
-  config.type_converters = [Rasti::DB::TypeConverters::TimeInZone]
+  config.type_converters = [Rasti::DB::TypeConverters::TimeInZone, Rasti::DB::TypeConverters::SQLite]
+  config.nql_filter_condition_strategy = Rasti::DB::NQL::FilterConditionStrategies::SQLite.new
 end
 
 User     = Rasti::DB::Model[:id, :name, :posts, :comments, :person, :comments_count]
 Post     = Rasti::DB::Model[:id, :title, :body, :user_id, :user, :comments, :categories, :language_id, :language, :notice, :author]
-Comment  = Rasti::DB::Model[:id, :text, :user_id, :user, :post_id, :post]
+Comment  = Rasti::DB::Model[:id, :text, :user_id, :user, :post_id, :post, :tags]
 Category = Rasti::DB::Model[:id, :name, :posts]
 Person   = Rasti::DB::Model[:document_number, :first_name, :last_name, :birth_date, :user_id, :user, :languages, :full_name]
 Language = Rasti::DB::Model[:id, :name, :people]
@@ -148,6 +149,7 @@ class Minitest::Spec
       db.create_table :comments do
         primary_key :id
         String :text, null: false
+        String :tags, default: Sequel.lit("'[]'")
         foreign_key :user_id, :users, null: false, index: true
         foreign_key :post_id, :posts, null: false, index: true
       end

data/spec/nql/filter_condition_spec.rb

@@ -19,13 +19,30 @@ describe 'NQL::FilterCondition' do
   def assert_comparison(filter, expected_left, expected_comparator, expected_right)
     filter.must_be_instance_of Sequel::SQL::BooleanExpression
     filter.op.must_equal expected_comparator.to_sym
-    
+
     left, right = filter.args
     assert_identifier left, expected_left
 
     right.must_equal expected_right
   end
 
+  describe 'None Filter Condition Strategy Validation' do
+
+    before do
+      Rasti::DB.nql_filter_condition_strategy = nil
+    end
+
+    after do
+      Rasti::DB.nql_filter_condition_strategy = Rasti::DB::NQL::FilterConditionStrategies::SQLite.new
+    end
+
+    it 'must raise error' do
+      error = proc { filter_condition 'column = value' }.must_raise RuntimeError
+      error.message.must_equal 'Undefined Rasti::DB.nql_filter_condition_strategy'
+    end
+
+  end
+
   describe 'Comparison' do
 
     it 'must create filter from expression with <' do
@@ -134,7 +151,7 @@ describe 'NQL::FilterCondition' do
 
     filter.must_be_instance_of Sequel::SQL::BooleanExpression
     filter.op.must_equal :AND
-    
+
     major_expression, and_expression = filter.args
     assert_comparison major_expression, 'column_one', '>', 1