rasti-db 1.5.0 → 2.3.0

data/spec/relations_spec.rb

@@ -30,14 +30,19 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal true
+      relation.from_many?.must_equal false
+      relation.to_one?.must_equal false
+      relation.to_many?.must_equal true
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
-      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...' }
+      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 rows, db
+      Users.relations[:posts].fetch_graph environment, rows
       
       rows[0][:posts].must_equal posts.where(user_id: user_id).all
     end
@@ -72,14 +77,19 @@ describe 'Relations' do
       relation.many_to_one?.must_equal true
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal false
+      relation.from_many?.must_equal true
+      relation.to_one?.must_equal true
+      relation.to_many?.must_equal false
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
-      db[:posts].insert user_id: user_id, title: 'Post 1', body: '...'
+      db[:posts].insert user_id: user_id, title: 'Post 1', body: '...', language_id: 1
       rows = db[:posts].all
 
-      Posts.relations[:user].fetch_graph rows, db
+      Posts.relations[:user].fetch_graph environment, rows
 
       rows[0][:user].must_equal users.first
     end
@@ -120,12 +130,17 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal true
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal false
+      relation.from_many?.must_equal true
+      relation.to_one?.must_equal false
+      relation.to_many?.must_equal true
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...' }
+      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1 }
 
       1.upto(4) { |i| db[:categories].insert name: "Category #{i}" }
 
@@ -136,7 +151,7 @@ describe 'Relations' do
 
       rows = db[:posts].all
 
-      Posts.relations[:categories].fetch_graph rows, db
+      Posts.relations[:categories].fetch_graph environment, rows
 
       rows[0][:categories].must_equal categories.where(id: [1,2]).all
       rows[1][:categories].must_equal categories.where(id: [3,4]).all
@@ -172,6 +187,11 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal true
+
+      relation.from_one?.must_equal true
+      relation.from_many?.must_equal false
+      relation.to_one?.must_equal true
+      relation.to_many?.must_equal false
     end
 
     it 'Graph' do
@@ -186,7 +206,7 @@ describe 'Relations' do
 
       rows = db[:users].all
 
-      Users.relations[:person].fetch_graph rows, db
+      Users.relations[:person].fetch_graph environment, rows
 
       2.times do |i|
         rows[i][:person].must_equal people.find("document_#{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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -140,6 +140,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
@@ -277,9 +291,20 @@ files:
 - lib/rasti-db.rb
 - lib/rasti/db.rb
 - lib/rasti/db/collection.rb
-- lib/rasti/db/helpers.rb
+- lib/rasti/db/computed_attribute.rb
+- 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
 - lib/rasti/db/nql/nodes/comparisons/equal.rb
@@ -292,6 +317,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
@@ -300,7 +327,6 @@ files:
 - lib/rasti/db/nql/nodes/constants/time.rb
 - lib/rasti/db/nql/nodes/constants/true.rb
 - lib/rasti/db/nql/nodes/disjunction.rb
-- lib/rasti/db/nql/nodes/field.rb
 - lib/rasti/db/nql/nodes/parenthesis_sentence.rb
 - lib/rasti/db/nql/nodes/sentence.rb
 - lib/rasti/db/nql/syntax.rb
@@ -317,19 +343,25 @@ 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
 - spec/collection_spec.rb
+- 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:
@@ -356,13 +388,17 @@ specification_version: 4
 summary: Database collections and relations
 test_files:
 - spec/collection_spec.rb
+- 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

data/lib/rasti/db/helpers.rb

@@ -1,16 +0,0 @@
-module Rasti
-  module DB
-    module Helpers
-      module WithSchema
-
-        private
-
-        def with_schema(table, field=nil)
-          qualified_table = schema ? Sequel[schema][table] : Sequel[table]
-          field ? Sequel[qualified_table][field] : qualified_table
-        end
-
-      end
-    end
-  end
-end

data/lib/rasti/db/nql/nodes/field.rb

@@ -1,23 +0,0 @@
-module Rasti
-  module DB
-    module NQL
-      module Nodes
-        class Field < Treetop::Runtime::SyntaxNode
-
-          def identifier
-            tables.empty? ? Sequel[column.to_sym] : Sequel[tables.join('__').to_sym][column.to_sym]
-          end
-
-          def tables
-            _tables.elements.map{ |e| e.table.text_value }
-          end
-
-          def column
-            _column.text_value
-          end
-
-        end
-      end
-    end
-  end
-end