rasti-db 1.5.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +52 -19
- data/lib/rasti/db.rb +11 -2
- data/lib/rasti/db/collection.rb +67 -36
- data/lib/rasti/db/computed_attribute.rb +22 -0
- data/lib/rasti/db/data_source.rb +18 -0
- data/lib/rasti/db/environment.rb +32 -0
- data/lib/rasti/db/nql/filter_condition_strategies/base.rb +17 -0
- data/lib/rasti/db/nql/filter_condition_strategies/postgres.rb +21 -0
- data/lib/rasti/db/nql/filter_condition_strategies/sqlite.rb +21 -0
- data/lib/rasti/db/nql/filter_condition_strategies/types/generic.rb +49 -0
- data/lib/rasti/db/nql/filter_condition_strategies/types/pg_array.rb +32 -0
- data/lib/rasti/db/nql/filter_condition_strategies/types/sqlite_array.rb +34 -0
- data/lib/rasti/db/nql/filter_condition_strategies/unsupported_type_comparison.rb +22 -0
- data/lib/rasti/db/nql/nodes/array_content.rb +21 -0
- data/lib/rasti/db/nql/nodes/attribute.rb +37 -0
- data/lib/rasti/db/nql/nodes/binary_node.rb +4 -0
- data/lib/rasti/db/nql/nodes/comparisons/base.rb +15 -1
- data/lib/rasti/db/nql/nodes/comparisons/equal.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/greater_than.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/greater_than_or_equal.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/include.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/less_than.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/less_than_or_equal.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/like.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/not_equal.rb +0 -4
- data/lib/rasti/db/nql/nodes/comparisons/not_include.rb +0 -4
- data/lib/rasti/db/nql/nodes/conjunction.rb +2 -2
- data/lib/rasti/db/nql/nodes/constants/array.rb +17 -0
- data/lib/rasti/db/nql/nodes/constants/base.rb +17 -0
- data/lib/rasti/db/nql/nodes/constants/false.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/float.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/integer.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/literal_string.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/string.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/time.rb +1 -1
- data/lib/rasti/db/nql/nodes/constants/true.rb +1 -1
- data/lib/rasti/db/nql/nodes/disjunction.rb +2 -2
- data/lib/rasti/db/nql/nodes/parenthesis_sentence.rb +6 -2
- data/lib/rasti/db/nql/nodes/sentence.rb +6 -2
- data/lib/rasti/db/nql/syntax.rb +262 -44
- data/lib/rasti/db/nql/syntax.treetop +27 -14
- data/lib/rasti/db/query.rb +55 -23
- data/lib/rasti/db/relations/base.rb +22 -8
- data/lib/rasti/db/relations/graph.rb +10 -16
- data/lib/rasti/db/relations/many_to_many.rb +57 -23
- data/lib/rasti/db/relations/many_to_one.rb +9 -7
- data/lib/rasti/db/relations/one_to_many.rb +21 -13
- data/lib/rasti/db/type_converters/sqlite.rb +62 -0
- data/lib/rasti/db/type_converters/sqlite_types/array.rb +34 -0
- data/lib/rasti/db/version.rb +1 -1
- data/rasti-db.gemspec +1 -0
- data/spec/collection_spec.rb +210 -50
- data/spec/computed_attribute_spec.rb +32 -0
- data/spec/minitest_helper.rb +77 -15
- data/spec/model_spec.rb +4 -2
- data/spec/nql/computed_attributes_spec.rb +29 -0
- data/spec/nql/filter_condition_spec.rb +23 -4
- data/spec/nql/filter_condition_strategies_spec.rb +112 -0
- data/spec/nql/syntax_parser_spec.rb +36 -5
- data/spec/query_spec.rb +340 -54
- data/spec/relations_spec.rb +27 -7
- data/spec/type_converters/sqlite_spec.rb +66 -0
- metadata +40 -4
- data/lib/rasti/db/helpers.rb +0 -16
- data/lib/rasti/db/nql/nodes/field.rb +0 -23
@@ -0,0 +1,18 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
class DataSource
|
4
|
+
|
5
|
+
attr_reader :db, :schema
|
6
|
+
|
7
|
+
def initialize(db, schema=nil)
|
8
|
+
@db = db
|
9
|
+
@schema = schema ? schema.to_sym : nil
|
10
|
+
end
|
11
|
+
|
12
|
+
def qualify(collection_name)
|
13
|
+
schema ? Sequel[schema][collection_name] : Sequel[collection_name]
|
14
|
+
end
|
15
|
+
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
class Environment
|
4
|
+
|
5
|
+
def initialize(data_sources)
|
6
|
+
@data_sources = data_sources
|
7
|
+
end
|
8
|
+
|
9
|
+
def data_source(name)
|
10
|
+
raise "Undefined data source #{name}" unless data_sources.key? name
|
11
|
+
data_sources[name]
|
12
|
+
end
|
13
|
+
|
14
|
+
def data_source_of(collection_class)
|
15
|
+
data_source collection_class.data_source_name
|
16
|
+
end
|
17
|
+
|
18
|
+
def qualify(data_source_name, collection_name)
|
19
|
+
data_source(data_source_name).qualify collection_name
|
20
|
+
end
|
21
|
+
|
22
|
+
def qualify_collection(collection_class)
|
23
|
+
data_source_of(collection_class).qualify collection_class.collection_name
|
24
|
+
end
|
25
|
+
|
26
|
+
private
|
27
|
+
|
28
|
+
attr_reader :data_sources
|
29
|
+
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
class Base
|
6
|
+
|
7
|
+
def filter_condition_for(comparison_name, identifier, argument)
|
8
|
+
type = type_for argument
|
9
|
+
raise UnsupportedTypeComparison.new(type, comparison_name) unless type.respond_to?(comparison_name)
|
10
|
+
type.public_send comparison_name, identifier, argument.value
|
11
|
+
end
|
12
|
+
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
class Postgres < Base
|
6
|
+
|
7
|
+
PG_TYPES = {
|
8
|
+
array: Types::PGArray
|
9
|
+
}
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def type_for(argument)
|
14
|
+
PG_TYPES.fetch(argument.type, Types::Generic)
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
class SQLite < Base
|
6
|
+
|
7
|
+
SQLITE_TYPES = {
|
8
|
+
array: Types::SQLiteArray
|
9
|
+
}
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def type_for(argument)
|
14
|
+
SQLITE_TYPES.fetch(argument.type, Types::Generic)
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
module Types
|
6
|
+
class Generic
|
7
|
+
|
8
|
+
def self.equal(identifier, value)
|
9
|
+
{identifier => value}
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.not_equal(identifier, value)
|
13
|
+
Sequel.negate equal(identifier, value)
|
14
|
+
end
|
15
|
+
|
16
|
+
def self.greater_than(identifier, value)
|
17
|
+
identifier > value
|
18
|
+
end
|
19
|
+
|
20
|
+
def self.greater_than_or_equal(identifier, value)
|
21
|
+
identifier >= value
|
22
|
+
end
|
23
|
+
|
24
|
+
def self.less_than(identifier, value)
|
25
|
+
identifier < value
|
26
|
+
end
|
27
|
+
|
28
|
+
def self.less_than_or_equal(identifier, value)
|
29
|
+
identifier <= value
|
30
|
+
end
|
31
|
+
|
32
|
+
def self.like(identifier, value)
|
33
|
+
Sequel.ilike identifier, value
|
34
|
+
end
|
35
|
+
|
36
|
+
def self.include(identifier, value)
|
37
|
+
Sequel.ilike identifier, "%#{value}%"
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.not_include(identifier, value)
|
41
|
+
~include(identifier, value)
|
42
|
+
end
|
43
|
+
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
module Types
|
6
|
+
class PGArray
|
7
|
+
|
8
|
+
def self.equal(identifier, values)
|
9
|
+
Sequel.&(
|
10
|
+
Sequel.pg_array(identifier).contains(Sequel.pg_array(values)),
|
11
|
+
Sequel.pg_array(identifier).contained_by(Sequel.pg_array(values))
|
12
|
+
)
|
13
|
+
end
|
14
|
+
|
15
|
+
def self.not_equal(identifier, values)
|
16
|
+
~equal(identifier, values)
|
17
|
+
end
|
18
|
+
|
19
|
+
def self.include(identifier, values)
|
20
|
+
Sequel.pg_array(identifier).overlaps Sequel.pg_array(values)
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.not_include(identifier, values)
|
24
|
+
~include(identifier, values)
|
25
|
+
end
|
26
|
+
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
module Types
|
6
|
+
class SQLiteArray
|
7
|
+
|
8
|
+
def self.equal(identifier, values)
|
9
|
+
array = values.map { |value| "\"#{value}\"" }.join(',')
|
10
|
+
{identifier => "[#{array}]"}
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.not_equal(identifier, values)
|
14
|
+
Sequel.|(*values.map { |value| ~Sequel.like(identifier, "%\"#{value}\"%") })
|
15
|
+
end
|
16
|
+
|
17
|
+
def self.like(identifier, values)
|
18
|
+
Sequel.|(*values.map { |value| Sequel.like(identifier, "%#{value}%") })
|
19
|
+
end
|
20
|
+
|
21
|
+
def self.include(identifier, values)
|
22
|
+
Sequel.|(*values.map { |value| Sequel.like(identifier, "%\"#{value}\"%") })
|
23
|
+
end
|
24
|
+
|
25
|
+
def self.not_include(identifier, values)
|
26
|
+
Sequel.&(*values.map { |value| ~Sequel.like(identifier, "%\"#{value}\"%") })
|
27
|
+
end
|
28
|
+
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module FilterConditionStrategies
|
5
|
+
class UnsupportedTypeComparison < StandardError
|
6
|
+
|
7
|
+
attr_reader :argument_type, :comparison_name
|
8
|
+
|
9
|
+
def initialize(argument_type, comparison_name)
|
10
|
+
@argument_type = argument_type
|
11
|
+
@comparison_name = comparison_name
|
12
|
+
end
|
13
|
+
|
14
|
+
def message
|
15
|
+
"Unsupported comparison #{comparison_name} for #{argument_type}"
|
16
|
+
end
|
17
|
+
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module Nodes
|
5
|
+
class ArrayContent < Treetop::Runtime::SyntaxNode
|
6
|
+
|
7
|
+
def values
|
8
|
+
[left.value] + right_value
|
9
|
+
end
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def right_value
|
14
|
+
right.is_a?(self.class) ? right.values : [right.value]
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
module Rasti
|
2
|
+
module DB
|
3
|
+
module NQL
|
4
|
+
module Nodes
|
5
|
+
class Attribute < Treetop::Runtime::SyntaxNode
|
6
|
+
|
7
|
+
def identifier(collection_class)
|
8
|
+
if computed? collection_class
|
9
|
+
collection_class.computed_attributes[column].identifier
|
10
|
+
else
|
11
|
+
tables.empty? ? Sequel[column] : Sequel[tables.join('__').to_sym][column]
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
def tables
|
16
|
+
_tables.elements.map{ |e| e.table.text_value }
|
17
|
+
end
|
18
|
+
|
19
|
+
def column
|
20
|
+
_column.text_value.to_sym
|
21
|
+
end
|
22
|
+
|
23
|
+
def computed_attributes(collection_class)
|
24
|
+
computed?(collection_class) ? [column] : []
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
def computed?(collection_class)
|
30
|
+
collection_class.computed_attributes.key? column
|
31
|
+
end
|
32
|
+
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -8,6 +8,10 @@ module Rasti
|
|
8
8
|
values.flat_map(&:dependency_tables)
|
9
9
|
end
|
10
10
|
|
11
|
+
def computed_attributes(collection_class)
|
12
|
+
left.computed_attributes(collection_class) | right.computed_attributes(collection_class)
|
13
|
+
end
|
14
|
+
|
11
15
|
def values
|
12
16
|
@values ||= values_for(left) + values_for(right)
|
13
17
|
end
|
@@ -6,7 +6,21 @@ module Rasti
|
|
6
6
|
class Base < Treetop::Runtime::SyntaxNode
|
7
7
|
|
8
8
|
def dependency_tables
|
9
|
-
|
9
|
+
attribute.tables.empty? ? [] : [attribute.tables.join('.')]
|
10
|
+
end
|
11
|
+
|
12
|
+
def computed_attributes(collection_class)
|
13
|
+
attribute.computed_attributes(collection_class)
|
14
|
+
end
|
15
|
+
|
16
|
+
def filter_condition(collection_class)
|
17
|
+
DB.nql_filter_condition_for comparison_name, attribute.identifier(collection_class), argument
|
18
|
+
end
|
19
|
+
|
20
|
+
private
|
21
|
+
|
22
|
+
def comparison_name
|
23
|
+
Inflecto.underscore(Inflecto.demodulize(self.class)).to_sym
|
10
24
|
end
|
11
25
|
|
12
26
|
end
|