rasti-db 2.2.0 → 3.0.0

data/spec/nql/filter_condition_strategies_spec.rb

@@ -0,0 +1,112 @@
+require 'minitest_helper'
+
+describe 'NQL::FilterConditionStrategies' do
+
+  let(:comments_query) { Rasti::DB::Query.new collection_class: Comments, dataset: db[:comments], environment: environment }
+
+  def sqls_where(query)
+    "#<Rasti::DB::Query: \"SELECT `comments`.* FROM `comments` WHERE (#{query})\">"
+  end
+
+  def sqls_where_not(query)
+    "#<Rasti::DB::Query: \"SELECT `comments`.* FROM `comments` WHERE NOT (#{query})\">"
+  end
+
+  def nql_s(nql_query)
+    comments_query.nql(nql_query).to_s
+  end
+
+  describe 'Generic' do
+
+    it 'Equal' do
+      nql_s('text = hola').must_equal sqls_where("`comments`.`text` = 'hola'")
+    end
+
+    it 'Not Equal' do
+      nql_s('text != hola').must_equal sqls_where("`comments`.`text` != 'hola'")
+    end
+
+    it 'Greather Than' do
+      nql_s('id > 1').must_equal sqls_where("`comments`.`id` > 1")
+    end
+
+    it 'Greather Than or Equal' do
+      nql_s('id >= 1').must_equal sqls_where("`comments`.`id` >= 1")
+    end
+
+    it 'Less Than' do
+      nql_s('id < 1').must_equal sqls_where("`comments`.`id` < 1")
+    end
+    
+    it 'Less Than or Equal' do
+      nql_s('id <= 1').must_equal sqls_where("`comments`.`id` <= 1")
+    end
+
+    it 'Like' do
+      nql_s('text ~ hola').must_equal sqls_where("UPPER(`comments`.`text`) LIKE UPPER('hola') ESCAPE '\\'")
+    end
+
+    it 'Include' do
+      nql_s('text: hola').must_equal sqls_where("UPPER(`comments`.`text`) LIKE UPPER('%hola%') ESCAPE '\\'")
+    end
+
+    it 'Not Include' do
+      nql_s('text!: hola').must_equal sqls_where_not("UPPER(`comments`.`text`) LIKE UPPER('%hola%') ESCAPE '\\'")
+    end
+
+  end
+
+  describe 'SQLite Array' do
+
+    it 'Equal' do
+      nql_s('tags = [notice]').must_equal sqls_where("`comments`.`tags` = '[\"notice\"]'")
+    end
+
+    it 'Not Equal' do
+      nql_s('tags != [notice]').must_equal sqls_where_not("`comments`.`tags` LIKE '%\"notice\"%' ESCAPE '\\'")
+    end
+
+    it 'Like' do
+      nql_s('tags ~ [notice]').must_equal sqls_where("`comments`.`tags` LIKE '%notice%' ESCAPE '\\'")
+    end
+
+    it 'Include' do
+      nql_s('tags: [notice]').must_equal sqls_where("`comments`.`tags` LIKE '%\"notice\"%' ESCAPE '\\'")
+    end
+
+    it 'Not Include' do
+      nql_s('tags!: [notice]').must_equal sqls_where_not("`comments`.`tags` LIKE '%\"notice\"%' ESCAPE '\\'")
+    end
+
+  end
+
+  describe 'Postgres Array' do
+
+    before do
+      Rasti::DB.nql_filter_condition_strategy = Rasti::DB::NQL::FilterConditionStrategies::Postgres.new
+      Sequel.extension :pg_array_ops
+    end
+
+    after do
+      Rasti::DB.nql_filter_condition_strategy = Rasti::DB::NQL::FilterConditionStrategies::SQLite.new
+    end
+
+    it 'Equal' do
+      nql_s('tags = [notice]').must_equal sqls_where("(`comments`.`tags` @> ARRAY['notice']) AND (`comments`.`tags` <@ ARRAY['notice'])")
+    end
+
+    it 'Not Equal' do
+      nql_s('tags != [notice]').must_equal sqls_where("NOT (`comments`.`tags` @> ARRAY['notice']) OR NOT (`comments`.`tags` <@ ARRAY['notice'])")
+    end
+
+    it 'Include' do
+      nql_s('tags: [notice]').must_equal sqls_where("`comments`.`tags` && ARRAY['notice']")
+    end
+
+    it 'Not Include' do
+      nql_s('tags!: [notice]').must_equal sqls_where_not("`comments`.`tags` && ARRAY['notice']")
+    end
+
+  end
+
+end

data/spec/nql/syntax_parser_spec.rb

@@ -213,4 +213,28 @@ describe 'NQL::SyntaxParser' do
 
   end
 
+  describe 'Array' do
+
+    it 'must parse array with one element' do
+      tree = parse 'column = [ a ]'
+      tree.proposition.argument.value.must_equal ['a']
+    end
+
+    it 'must parse array with many elements' do 
+      tree = parse 'column = [ a, b, c ]'
+      tree.proposition.argument.value.must_equal ['a', 'b', 'c']
+    end
+
+    it 'must parse array respecting content types' do
+      tree = parse 'column = [ true, 12:00, 1.1, 1, "literal string", string ]'
+      tree.proposition.argument.value.must_equal [true, Timing::TimeInZone.parse('12:00').to_s, 1.1, 1, "literal string", 'string']
+    end
+
+    it 'must parse array with literal string allowing reserved characters in conflict with array' do
+      tree = parse 'column = [ ",", "[", "]", "[,", "],", "[,]", "simple literal" ]'
+      tree.proposition.argument.value.must_equal [ ',', '[', ']', '[,', '],', '[,]', 'simple literal' ]
+    end
+
+  end
+
 end

data/spec/query_spec.rb

@@ -462,6 +462,95 @@ describe 'Query' do
 
     end
 
+    describe 'Filter Array' do
+
+      def filter_condition_must_raise(comparison_symbol, comparison_name)
+        error = proc { comments_query.nql("tags #{comparison_symbol} [fake, notice]") }.must_raise Rasti::DB::NQL::FilterConditionStrategies::UnsupportedTypeComparison
+        error.argument_type.must_equal Rasti::DB::NQL::FilterConditionStrategies::Types::SQLiteArray
+        error.comparison_name.must_equal comparison_name
+        error.message.must_equal "Unsupported comparison #{comparison_name} for Rasti::DB::NQL::FilterConditionStrategies::Types::SQLiteArray"
+      end
+
+      it 'Must raise exception from not supported methods' do
+        comparisons = {
+          greater_than: '>',
+          greater_than_or_equal: '>=',
+          less_than: '<',
+          less_than_or_equal: '<='
+        }
+
+        comparisons.each do |name, symbol|
+          filter_condition_must_raise symbol, name
+        end
+      end
+
+      it 'Included any of these elements' do
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake","notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice 2', tags: '["notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice 3', tags: '["fake_notice"]'
+        expected_comments = [
+          Comment.new(id: 4, text: 'fake notice', tags: ['fake','notice'], user_id: 5, post_id: 1),
+          Comment.new(id: 5, text: 'fake notice 2', tags: ['notice'], user_id: 5, post_id: 1)
+        ]
+
+        comments_query.nql('tags: [ fake, notice ]')
+                    .all
+                    .must_equal expected_comments
+      end
+
+      it 'Included exactly all these elements' do
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake","notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice 2', tags: '["notice"]'
+        comments_query.nql('tags = [fake, notice]')
+                    .all
+                    .must_equal [Comment.new(id: 4, text: 'fake notice', tags: ['fake','notice'], user_id: 5, post_id: 1)]
+      end
+
+      it 'Not included anyone of these elements' do
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake","notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'Good notice!', tags: '["good"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake"]'
+        expected_comments = [
+          Comment.new(id: 1, text: 'Comment 1', tags: [], user_id: 5, post_id: 1),
+          Comment.new(id: 2, text: 'Comment 2', tags: [], user_id: 7, post_id: 1),
+          Comment.new(id: 3, text: 'Comment 3', tags: [], user_id: 2, post_id: 2),
+          Comment.new(id: 5, text: 'Good notice!', tags: ['good'], user_id: 5, post_id: 1)
+        ]
+        comments_query.nql('tags !: [fake, notice]')
+                    .all
+                    .must_equal expected_comments
+      end
+
+      it 'Not include any of these elements' do
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake","notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'Good notice!', tags: '["good"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake"]'
+        expected_comments = [
+          Comment.new(id: 1, text: 'Comment 1', tags: '[]', user_id: 5, post_id: 1),
+          Comment.new(id: 2, text: 'Comment 2', tags: '[]', user_id: 7, post_id: 1),
+          Comment.new(id: 3, text: 'Comment 3', tags: '[]', user_id: 2, post_id: 2),
+          Comment.new(id: 5, text: 'Good notice!', tags: ['good'], user_id: 5, post_id: 1),
+          Comment.new(id: 6, text: 'fake notice', tags: ['fake'], user_id: 5, post_id: 1)
+        ]
+        comments_query.nql('tags != [fake, notice]')
+                    .all
+                    .must_equal expected_comments
+      end
+
+      it 'Include any like these elements' do
+        db[:comments].insert post_id: 1, user_id: 5, text: 'fake notice', tags: '["fake","notice"]'
+        db[:comments].insert post_id: 1, user_id: 5, text: 'this is a fake notice!', tags: '["fake_notice"]'
+        expected_comments = [
+          Comment.new(id: 4, text: 'fake notice', tags: ['fake','notice'], user_id: 5, post_id: 1),
+          Comment.new(id: 5, text: 'this is a fake notice!', tags: ['fake_notice'], user_id: 5, post_id: 1)
+        ]
+        comments_query.nql('tags ~ [fake]')
+                      .all
+                      .must_equal expected_comments
+      end
+
+    end
+
   end
 
 end

data/spec/relations_spec.rb

@@ -8,15 +8,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::OneToMany.new :posts, Users
-        
+
         relation.target_collection_class.must_equal Posts
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::OneToMany.new :articles, Users, collection: 'Posts', 
+        relation = Rasti::DB::Relations::OneToMany.new :articles, Users, collection: 'Posts',
                                                                          foreign_key: :id_user
-        
+
         relation.target_collection_class.must_equal Posts
         relation.foreign_key.must_equal :id_user
       end
@@ -41,9 +41,9 @@ describe 'Relations' do
       user_id = db[:users].insert name: 'User 1'
       1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1 }
       rows = db[:users].all
-      
+
       Users.relations[:posts].fetch_graph environment, rows
-      
+
       rows[0][:posts].must_equal posts.where(user_id: user_id).all
     end
 
@@ -55,15 +55,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::ManyToOne.new :user, Posts
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::ManyToOne.new :publisher, Posts, collection: 'Users', 
+        relation = Rasti::DB::Relations::ManyToOne.new :publisher, Posts, collection: 'Users',
                                                                           foreign_key: :publisher_id
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :publisher_id
       end
@@ -102,7 +102,7 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::ManyToMany.new :categories, Posts
-        
+
         relation.target_collection_class.must_equal Categories
         relation.source_foreign_key.must_equal :post_id
         relation.target_foreign_key.must_equal :category_id
@@ -110,11 +110,11 @@ describe 'Relations' do
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::ManyToMany.new :tags, Posts, collection: 'Categories', 
-                                                                      source_foreign_key: :article_id, 
-                                                                      target_foreign_key: :tag_id, 
+        relation = Rasti::DB::Relations::ManyToMany.new :tags, Posts, collection: 'Categories',
+                                                                      source_foreign_key: :article_id,
+                                                                      target_foreign_key: :tag_id,
                                                                       relation_collection_name: :tags_articles
-        
+
         relation.target_collection_class.must_equal Categories
         relation.source_foreign_key.must_equal :article_id
         relation.target_foreign_key.must_equal :tag_id
@@ -165,15 +165,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::OneToOne.new :person, Users
-        
+
         relation.target_collection_class.must_equal People
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::OneToOne.new :person, Users, collection: 'Users', 
+        relation = Rasti::DB::Relations::OneToOne.new :person, Users, collection: 'Users',
                                                                       foreign_key: :id_user
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :id_user
       end
@@ -197,7 +197,7 @@ describe 'Relations' do
     it 'Graph' do
       2.times 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,

data/spec/type_converters/sqlite_spec.rb

@@ -0,0 +1,66 @@
+require 'minitest_helper'
+
+describe Rasti::DB::TypeConverters::SQLite do
+
+  let(:type_converter) { Rasti::DB::TypeConverters::SQLite }
+
+  let(:sqlite) do
+    Object.new.tap do |sqlite|
+
+      def sqlite.opts
+        {
+          database: 'database'
+        }
+      end
+
+      def sqlite.schema(table_name, opts={})
+        [
+          [:text_array, {db_type: 'text[]'}],
+        ]
+      end
+
+    end
+  end
+
+  describe 'Default' do
+
+    it 'must not change value in to_db if column not found in mapping' do
+      string = type_converter.to_db sqlite, :table_name, :column, "hola"
+      string.class.must_equal String
+      string.must_equal "hola"
+    end
+
+    it 'must not change value in from_db if class not found in mapping' do
+      string = type_converter.from_db "hola"
+      string.class.must_equal String
+      string.must_equal "hola"
+    end
+
+  end
+
+   describe 'Array' do
+
+    describe 'To DB' do
+
+      it 'must transform Array to SQLiteArray' do
+        sqlite_array = type_converter.to_db sqlite, :table_name, :text_array, ['a', 'b', 'c']
+        sqlite_array.class.must_equal String
+        sqlite_array.must_equal '["a","b","c"]'
+      end
+
+    end
+
+    describe 'From DB' do
+
+      it 'must transform SQLiteArray to Array' do
+        sqlite_array = '["a","b","c"]'
+        array = type_converter.from_db sqlite_array
+        array.class.must_equal Array
+        array.must_equal ['a', 'b', 'c']
+      end
+
+    end
+
+  end
+
+end

data/spec/type_converters/time_in_zone_spec.rb

@@ -7,7 +7,7 @@ describe Rasti::DB::TypeConverters::TimeInZone do
   describe 'To DB' do
 
     it 'must not transform Time to TimeInZone' do
-      time = Time.now
+      time = Timing::TimeInZone.now
 
       converted_time = type_converter.to_db db, 'table', :time, time
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rasti-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: inflecto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +309,15 @@ files:
 - lib/rasti/db/data_source.rb
 - lib/rasti/db/environment.rb
 - lib/rasti/db/model.rb
+- lib/rasti/db/nql/filter_condition_strategies/base.rb
+- lib/rasti/db/nql/filter_condition_strategies/postgres.rb
+- lib/rasti/db/nql/filter_condition_strategies/sqlite.rb
+- lib/rasti/db/nql/filter_condition_strategies/types/generic.rb
+- lib/rasti/db/nql/filter_condition_strategies/types/pg_array.rb
+- lib/rasti/db/nql/filter_condition_strategies/types/sqlite_array.rb
+- lib/rasti/db/nql/filter_condition_strategies/unsupported_type_comparison.rb
 - lib/rasti/db/nql/invalid_expression_error.rb
+- lib/rasti/db/nql/nodes/array_content.rb
 - lib/rasti/db/nql/nodes/attribute.rb
 - lib/rasti/db/nql/nodes/binary_node.rb
 - lib/rasti/db/nql/nodes/comparisons/base.rb
@@ -295,6 +331,8 @@ files:
 - lib/rasti/db/nql/nodes/comparisons/not_equal.rb
 - lib/rasti/db/nql/nodes/comparisons/not_include.rb
 - lib/rasti/db/nql/nodes/conjunction.rb
+- lib/rasti/db/nql/nodes/constants/array.rb
+- lib/rasti/db/nql/nodes/constants/base.rb
 - lib/rasti/db/nql/nodes/constants/false.rb
 - lib/rasti/db/nql/nodes/constants/float.rb
 - lib/rasti/db/nql/nodes/constants/integer.rb
@@ -319,6 +357,8 @@ files:
 - lib/rasti/db/type_converters/postgres_types/hstore.rb
 - lib/rasti/db/type_converters/postgres_types/json.rb
 - lib/rasti/db/type_converters/postgres_types/jsonb.rb
+- lib/rasti/db/type_converters/sqlite.rb
+- lib/rasti/db/type_converters/sqlite_types/array.rb
 - lib/rasti/db/type_converters/time_in_zone.rb
 - lib/rasti/db/version.rb
 - rasti-db.gemspec
@@ -326,14 +366,15 @@ files:
 - spec/computed_attribute_spec.rb
 - spec/coverage_helper.rb
 - spec/minitest_helper.rb
-- spec/model_spec.rb
 - spec/nql/computed_attributes_spec.rb
 - spec/nql/dependency_tables_spec.rb
 - spec/nql/filter_condition_spec.rb
+- spec/nql/filter_condition_strategies_spec.rb
 - spec/nql/syntax_parser_spec.rb
 - spec/query_spec.rb
 - spec/relations_spec.rb
 - spec/type_converters/postgres_spec.rb
+- spec/type_converters/sqlite_spec.rb
 - spec/type_converters/time_in_zone_spec.rb
 homepage: https://github.com/gabynaiman/rasti-db
 licenses:
@@ -363,12 +404,13 @@ test_files:
 - spec/computed_attribute_spec.rb
 - spec/coverage_helper.rb
 - spec/minitest_helper.rb
-- spec/model_spec.rb
 - spec/nql/computed_attributes_spec.rb
 - spec/nql/dependency_tables_spec.rb
 - spec/nql/filter_condition_spec.rb
+- spec/nql/filter_condition_strategies_spec.rb
 - spec/nql/syntax_parser_spec.rb
 - spec/query_spec.rb
 - spec/relations_spec.rb
 - spec/type_converters/postgres_spec.rb
+- spec/type_converters/sqlite_spec.rb
 - spec/type_converters/time_in_zone_spec.rb