Compare commits
No commits in common. "master" and "v0.0.4.5" have entirely different histories.
1
Rakefile
1
Rakefile
|
@ -15,6 +15,7 @@ begin
|
||||||
gem.add_dependency 'activerecord'
|
gem.add_dependency 'activerecord'
|
||||||
gem.add_dependency 'activesupport'
|
gem.add_dependency 'activesupport'
|
||||||
gem.add_dependency 'json'
|
gem.add_dependency 'json'
|
||||||
|
gem.add_dependency 'methodphitamine'
|
||||||
end
|
end
|
||||||
Jeweler::GemcutterTasks.new
|
Jeweler::GemcutterTasks.new
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
|
|
|
@ -43,9 +43,9 @@ class SmqlToAR
|
||||||
# Die eigentliche Exception wird in @data[:exception] hinterlegt.
|
# Die eigentliche Exception wird in @data[:exception] hinterlegt.
|
||||||
class SubSMQLError < SMQLError
|
class SubSMQLError < SMQLError
|
||||||
def initialize query, model, exception
|
def initialize query, model, exception
|
||||||
ex = {class: exception.class, message: exception.message}
|
ex = {:class => exception.class, :message => exception.message}
|
||||||
ex[:data] = exception.data if exception.respond_to? :data
|
ex[:data] = exception.data if exception.respond_to? :data
|
||||||
super query: query, model: model.to_s, exception: ex
|
super :query => query, :model => model.to_s, :exception => ex
|
||||||
set_backtrace exception.backtrace
|
set_backtrace exception.backtrace
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -55,49 +55,49 @@ class SmqlToAR
|
||||||
# Malformed ColOp
|
# Malformed ColOp
|
||||||
class UnexpectedColOpError < ParseError
|
class UnexpectedColOpError < ParseError
|
||||||
def initialize model, colop, val
|
def initialize model, colop, val
|
||||||
super got: colop, val: val, model: model.to_s
|
super :got => colop, :val => val, :model => model.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class UnexpectedError < ParseError
|
class UnexpectedError < ParseError
|
||||||
def initialize model, colop, val
|
def initialize model, colop, val
|
||||||
super got: {colop => val}, model: model.to_s
|
super :got => {colop => val}, :model => model.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class NonExistingSelectableError < SMQLError
|
class NonExistingSelectableError < SMQLError
|
||||||
def initialize got
|
def initialize got
|
||||||
super got: got
|
super :got => got
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class NonExistingColumnError < SMQLError
|
class NonExistingColumnError < SMQLError
|
||||||
def initialize expected, got
|
def initialize expected, got
|
||||||
super expected: expected, got: got
|
super :expected => expected, :got => got
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class NonExistingRelationError < SMQLError
|
class NonExistingRelationError < SMQLError
|
||||||
def initialize expected, got
|
def initialize expected, got
|
||||||
super expected: expected, got: got
|
super :expected => expected, :got => got
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class ProtectedColumnError < SMQLError
|
class ProtectedColumnError < SMQLError
|
||||||
def initialize protected_column
|
def initialize protected_column
|
||||||
super protected_column: protected_column
|
super :protected_column => protected_column
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class RootOnlyFunctionError < SMQLError
|
class RootOnlyFunctionError < SMQLError
|
||||||
def initialize path
|
def initialize path
|
||||||
super path: path
|
super :path => path
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class ConColumnError < SMQLError
|
class ConColumnError < SMQLError
|
||||||
def initialize expected, got
|
def initialize expected, got
|
||||||
super expected: expected, got: got
|
super :expected => expected, :got => got
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -120,7 +120,6 @@ class SmqlToAR
|
||||||
attr_accessor :model
|
attr_accessor :model
|
||||||
|
|
||||||
class Col
|
class Col
|
||||||
include Comparable
|
|
||||||
attr_accessor :col, :as
|
attr_accessor :col, :as
|
||||||
def initialize col, as = nil
|
def initialize col, as = nil
|
||||||
if col.kind_of? Col
|
if col.kind_of? Col
|
||||||
|
@ -140,11 +139,12 @@ class SmqlToAR
|
||||||
|
|
||||||
def == other
|
def == other
|
||||||
other = Col.new other
|
other = Col.new other
|
||||||
@col == other.col && @as == other.as
|
@col = other.col && @as == other.col
|
||||||
end
|
end
|
||||||
|
|
||||||
def === other
|
def === other
|
||||||
@col == Col.new( other).col
|
other = Col.new other
|
||||||
|
@col == other.col
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -152,10 +152,10 @@ class SmqlToAR
|
||||||
@model = model
|
@model = model
|
||||||
@last_model = nil
|
@last_model = nil
|
||||||
*@path, @col = *Array.wrap( col).
|
*@path, @col = *Array.wrap( col).
|
||||||
collect {|x| x.to_s.split /[.\/]/ }.
|
collect( &it.to_s.split( /[.\/]/)).
|
||||||
flatten.
|
flatten.
|
||||||
collect( &Col.method( :new)).
|
collect( &Col.method( :new)).
|
||||||
reject {|x| x === :self }
|
reject( &it===:self)
|
||||||
end
|
end
|
||||||
|
|
||||||
def last_model
|
def last_model
|
||||||
|
@ -222,8 +222,10 @@ class SmqlToAR
|
||||||
SmqlToAR.logger = ::Rails.logger
|
SmqlToAR.logger = ::Rails.logger
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
require 'logger'
|
||||||
|
@@logger = Logger.new $stdout
|
||||||
end
|
end
|
||||||
@@logger = ::Rails.logger || begin require 'logger'; Logger.new( $stdout) end
|
|
||||||
|
|
||||||
class <<self
|
class <<self
|
||||||
def logger=(logger) @@logger = logger end
|
def logger=(logger) @@logger = logger end
|
||||||
|
@ -243,8 +245,8 @@ class SmqlToAR
|
||||||
refls = model.respond_to?( :reflections) && model.reflections
|
refls = model.respond_to?( :reflections) && model.reflections
|
||||||
refls && refls.each do |name, refl|
|
refls && refls.each do |name, refl|
|
||||||
r[model.name][name] = case refl
|
r[model.name][name] = case refl
|
||||||
when ActiveRecord::Reflection::ThroughReflection then {macro: refl.macro, model: refl.klass.name, through: refl.through_reflection.name}
|
when ActiveRecord::Reflection::ThroughReflection then {:macro => refl.macro, :model => refl.klass.name, :through => refl.through_reflection.name}
|
||||||
when ActiveRecord::Reflection::AssociationReflection then {macro: refl.macro, model: refl.klass.name}
|
when ActiveRecord::Reflection::AssociationReflection then {:macro => refl.macro, :model => refl.klass.name}
|
||||||
else raise "Ups: #{refl.class}"
|
else raise "Ups: #{refl.class}"
|
||||||
end
|
end
|
||||||
models.push refl.klass unless r.keys.include? refl.klass.name
|
models.push refl.klass unless r.keys.include? refl.klass.name
|
||||||
|
@ -292,27 +294,8 @@ class SmqlToAR
|
||||||
def self.reload_library
|
def self.reload_library
|
||||||
lib_dir = File.dirname __FILE__
|
lib_dir = File.dirname __FILE__
|
||||||
fj = lambda {|*a| File.join lib_dir, *a }
|
fj = lambda {|*a| File.join lib_dir, *a }
|
||||||
Object.send :remove_const, :SmqlToAR
|
load fj.call( 'smql_to_ar.rb')
|
||||||
load fj[ 'smql_to_ar.rb']
|
load fj.call( 'smql_to_ar', 'condition_types.rb')
|
||||||
load fj[ 'smql_to_ar', 'condition_types.rb']
|
load fj.call( 'smql_to_ar', 'query_builder.rb')
|
||||||
load fj[ 'smql_to_ar', 'query_builder.rb']
|
|
||||||
end
|
|
||||||
|
|
||||||
module ActiveRecordExtensions
|
|
||||||
def self.included base
|
|
||||||
base.extend ClassMethods
|
|
||||||
end
|
|
||||||
|
|
||||||
module ClassMethods
|
|
||||||
def smql *params
|
|
||||||
SmqlToAR.to_ar self, *params
|
|
||||||
end
|
|
||||||
|
|
||||||
def smql_protected
|
|
||||||
[]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
ActiveRecord::Base.send :include, SmqlToAR::ActiveRecordExtensions
|
|
||||||
|
|
|
@ -14,9 +14,6 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
# TODO:
|
|
||||||
# * Array als Typ ist zu allgemein. Allgemeine Lösung gesucht, um die Typen im Array angeben zu können.
|
|
||||||
|
|
||||||
class SmqlToAR
|
class SmqlToAR
|
||||||
#############################################################################
|
#############################################################################
|
||||||
# Alle Subklassen (qualitativ: ConditionTypes::*), die als Superklasse Condition haben,
|
# Alle Subklassen (qualitativ: ConditionTypes::*), die als Superklasse Condition haben,
|
||||||
|
@ -103,11 +100,11 @@ class SmqlToAR
|
||||||
# Passt das Object, die Klasse instanzieren.
|
# Passt das Object, die Klasse instanzieren.
|
||||||
def try_parse model, cols, op, val
|
def try_parse model, cols, op, val
|
||||||
#p :class => self, :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
|
#p :class => self, :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
|
||||||
new model, cols, val if self::Operator === op and self::Expected.any? {|x| x === val}
|
new model, cols, val if self::Operator === op and self::Expected.any?( &it === val)
|
||||||
end
|
end
|
||||||
|
|
||||||
def inspect
|
def inspect
|
||||||
"#{self.name}( :operator=>#{self::Operator.inspect}, :expected=>#{self::Expected.inspect}, :where=>#{self::Where.inspect})"
|
"#{self.name}(:operator=>#{self::Operator.inspect}, :expected=>#{self::Expected.inspect}, :where=>#{self::Where.inspect})"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -153,7 +150,7 @@ class SmqlToAR
|
||||||
# 2) {"givenname=", ["Peter", "Hans"]} #=> ( givenname = 'Peter' OR givenname = 'Hans' )
|
# 2) {"givenname=", ["Peter", "Hans"]} #=> ( givenname = 'Peter' OR givenname = 'Hans' )
|
||||||
# 3) {"givenname|surname=", ["Peter", "Mueller"]}
|
# 3) {"givenname|surname=", ["Peter", "Mueller"]}
|
||||||
# #=> ( givenname = 'Peter' OR surname = 'Peter' ) AND ( givenname = 'Mueller' OR surname = 'Mueller' )
|
# #=> ( givenname = 'Peter' OR surname = 'Peter' ) AND ( givenname = 'Mueller' OR surname = 'Mueller' )
|
||||||
def condition_build builder, table
|
def build builder, table
|
||||||
values = Hash[ @value.collect {|value| [ builder.vid, value ] } ]
|
values = Hash[ @value.collect {|value| [ builder.vid, value ] } ]
|
||||||
values.each {|k, v| builder.wobs k.to_sym => v }
|
values.each {|k, v| builder.wobs k.to_sym => v }
|
||||||
if 1 == @cols.length
|
if 1 == @cols.length
|
||||||
|
@ -174,16 +171,15 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build condition_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class NotInRange < Condition
|
class NotInRange < Condition
|
||||||
Operator = '!..'
|
Operator = '!..'
|
||||||
Where = '%s NOT BETWEEN %s AND %s'
|
Where = "%s NOT BETWEEN %s AND %s"
|
||||||
Expected = [Range, lambda {|val| Array === val && 2 == val.length } ]
|
Expected = [Range, lambda {|val| Array === val && 2 == val.length } ]
|
||||||
|
|
||||||
def initialize model, cols, val
|
def initialize model, cols, val
|
||||||
if Array === val
|
if Array === val && 2 == val.length
|
||||||
f, l = val
|
f, l = val
|
||||||
f, l = Time.parse(f), Time.parse(l) if f.kind_of? String
|
f, l = Time.parse(f), Time.parse(l) if f.kind_of? String
|
||||||
val = f..l
|
val = f..l
|
||||||
|
@ -191,7 +187,7 @@ class SmqlToAR
|
||||||
super model, cols, val
|
super model, cols, val
|
||||||
end
|
end
|
||||||
|
|
||||||
def not_in_range_build builder, table
|
def build builder, table
|
||||||
builder.wobs (v1 = builder.vid).to_sym => @value.begin, (v2 = builder.vid).to_sym => @value.end
|
builder.wobs (v1 = builder.vid).to_sym => @value.begin, (v2 = builder.vid).to_sym => @value.end
|
||||||
@cols.each do |col|
|
@cols.each do |col|
|
||||||
col.joins builder, table
|
col.joins builder, table
|
||||||
|
@ -199,57 +195,15 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build not_in_range_build
|
|
||||||
end
|
end
|
||||||
InRange = simple_condition NotInRange, '..', '%s BETWEEN %s AND %s'
|
InRange = simple_condition NotInRange, '..', "%s BETWEEN %s AND %s"
|
||||||
|
|
||||||
# Every key-pair will be ORed. No multiple values possible.
|
|
||||||
class Overlaps < Condition
|
|
||||||
Operator, Where = '<=>', '(%s, %s) OVERLAPS (%s, %s)'
|
|
||||||
Expected = [Range, lambda {|val|
|
|
||||||
Array === val && 2 == val.length &&
|
|
||||||
[Time, Date, String].any? {|v|v===val[0]} &&
|
|
||||||
[Numeric, String].any? {|v|v===val[1]}
|
|
||||||
}]
|
|
||||||
|
|
||||||
def initialize model, cols, val
|
|
||||||
if Array === val
|
|
||||||
f = Time.parse( val[0]).localtime
|
|
||||||
l = val[1]
|
|
||||||
l = case l
|
|
||||||
when String then Time.parse( l).localtime
|
|
||||||
when Numeric then f+l
|
|
||||||
else raise ArgumentError, "Unexpected type for end-value #{l.inspect}"
|
|
||||||
end
|
|
||||||
f += f.utc_offset
|
|
||||||
l += l.utc_offset
|
|
||||||
val = f.utc..l.utc
|
|
||||||
end
|
|
||||||
super model, cols, val
|
|
||||||
end
|
|
||||||
|
|
||||||
def overlaps_build builder, table
|
|
||||||
builder = Or.new builder
|
|
||||||
builder.wobs (v1 = builder.vid).to_sym => @value.begin, (v2 = builder.vid).to_sym => @value.end
|
|
||||||
v1 = "TIMESTAMP #{v1}"
|
|
||||||
v2 = "TIMESTAMP #{v2}"
|
|
||||||
@cols.each do |col|
|
|
||||||
col.joins builder, table
|
|
||||||
end.each_slice 2 do |f,s|
|
|
||||||
builder.where self.class::Where % [
|
|
||||||
builder.column( table+f.path, f.col), builder.column( table+s.path, s.col), v1, v2]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
alias build overlaps_build
|
|
||||||
end
|
|
||||||
NotOverlaps = simple_condition Overlaps, '<=>', 'NOT (%s, %s) OVERLAPS (%s, %s)'
|
|
||||||
|
|
||||||
class NotIn < Condition
|
class NotIn < Condition
|
||||||
Operator = '!|='
|
Operator = '!|='
|
||||||
Where = "%s NOT IN (%s)"
|
Where = "%s NOT IN (%s)"
|
||||||
Expected = [Array]
|
Expected = [Array]
|
||||||
|
|
||||||
def not_in_build builder, table
|
def build builder, table
|
||||||
builder.wobs (v = builder.vid).to_sym => @value
|
builder.wobs (v = builder.vid).to_sym => @value
|
||||||
@cols.each do |col|
|
@cols.each do |col|
|
||||||
col.joins builder, table
|
col.joins builder, table
|
||||||
|
@ -257,7 +211,6 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build not_in_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
In = simple_condition NotIn, '|=', '%s IN (%s)', [Array]
|
In = simple_condition NotIn, '|=', '%s IN (%s)', [Array]
|
||||||
|
@ -266,20 +219,13 @@ class SmqlToAR
|
||||||
NotEqual2 = simple_condition Condition, '<>', "%s <> %s", [Array, String, Numeric]
|
NotEqual2 = simple_condition Condition, '<>', "%s <> %s", [Array, String, Numeric]
|
||||||
GreaterThanOrEqual = simple_condition Condition, '>=', "%s >= %s", [Array, Numeric]
|
GreaterThanOrEqual = simple_condition Condition, '>=', "%s >= %s", [Array, Numeric]
|
||||||
LesserThanOrEqual = simple_condition Condition, '<=', "%s <= %s", [Array, Numeric]
|
LesserThanOrEqual = simple_condition Condition, '<=', "%s <= %s", [Array, Numeric]
|
||||||
class StringTimeGreaterThanOrEqual < Condition
|
|
||||||
Operator, Where, Expected = '>=', '%s >= %s', [Time, Date, String]
|
|
||||||
def initialize model, cols, val
|
|
||||||
super model, cols, Time.parse( val.to_s)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
StringTimeLesserThanOrEqual = simple_condition StringTimeGreaterThanOrEqual, '<=', "%s <= %s"
|
|
||||||
|
|
||||||
# Examples:
|
# Examples:
|
||||||
# { 'articles=>' => { id: 1 } }
|
# { 'articles=>' => { id: 1 } }
|
||||||
# { 'articles=>' => [ { id: 1 }, { id: 2 } ] }
|
# { 'articles=>' => [ { id: 1 }, { id: 2 } ] }
|
||||||
class EqualJoin <Condition
|
class EqualJoin <Condition
|
||||||
Operator = '=>'
|
Operator = '=>'
|
||||||
Expected = [Hash, lambda {|x| x.kind_of?( Array) and x.all? {|y| y.kind_of?( Hash) }}]
|
Expected = [Hash, lambda {|x| x.kind_of?( Array) and x.all?( &it.kind_of?( Hash))}]
|
||||||
|
|
||||||
def initialize *pars
|
def initialize *pars
|
||||||
super( *pars)
|
super( *pars)
|
||||||
|
@ -296,7 +242,7 @@ class SmqlToAR
|
||||||
raise_unless col.relation, NonExistingRelationError.new( %w[Relation], col)
|
raise_unless col.relation, NonExistingRelationError.new( %w[Relation], col)
|
||||||
end
|
end
|
||||||
|
|
||||||
def equal_join_build builder, table
|
def build builder, table
|
||||||
if 2 < @cols.first.second.length
|
if 2 < @cols.first.second.length
|
||||||
b2, b3 = And, Or
|
b2, b3 = And, Or
|
||||||
else
|
else
|
||||||
|
@ -306,17 +252,13 @@ class SmqlToAR
|
||||||
@cols.each do |col, sub|
|
@cols.each do |col, sub|
|
||||||
model, *sub = sub
|
model, *sub = sub
|
||||||
t = table + col.path + [col.col]
|
t = table + col.path + [col.col]
|
||||||
col.joins builder, table
|
col.joins.each {|j, m| builder.joins table+j, m }
|
||||||
builder.joins t, model
|
builder.joins t, model
|
||||||
b4 = b3.new( b2)
|
b4 = b3.new( b2)
|
||||||
sub.each do |i|
|
sub.each {|i| i.collect( &it.build( And.new( b4), t)) }
|
||||||
b5 = And.new b4
|
|
||||||
i.collect {|j| j.build b5, t }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build equal_join_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Takes to Queries.
|
# Takes to Queries.
|
||||||
|
@ -346,25 +288,22 @@ class SmqlToAR
|
||||||
raise_unless col.child?, ConColumnError.new( [:Column], col)
|
raise_unless col.child?, ConColumnError.new( [:Column], col)
|
||||||
end
|
end
|
||||||
|
|
||||||
def sub_equal_join_build builder, table
|
def build builder, table
|
||||||
@cols.each do |col, sub|
|
@cols.each do |col, sub|
|
||||||
t = table+col.to_a
|
t = table+col.to_a
|
||||||
builder.sub_joins t, col, *sub[0..1]
|
builder.sub_joins t, col, *sub[0..1]
|
||||||
#ap sub: sub[2..-1]
|
#ap sub: sub[2..-1]
|
||||||
sub[2..-1].each {|x| x.build builder, t }
|
sub[2..-1].each &it.build( builder, t)
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build sub_equal_join_build
|
|
||||||
end
|
end
|
||||||
=end
|
=end
|
||||||
|
|
||||||
Equal = simple_condition Condition, '=', "%s = %s", [Array, String, Numeric, Date, Time]
|
Equal = simple_condition Condition, '=', "%s = %s", [Array, String, Numeric]
|
||||||
Equal2 = simple_condition Equal, '', "%s = %s", [String, Numeric, Date, Time]
|
Equal2 = simple_condition Equal, '', "%s = %s", [String, Numeric]
|
||||||
GreaterThan = simple_condition Condition, '>', "%s > %s", [Array, Numeric]
|
GreaterThan = simple_condition Condition, '>', "%s > %s", [Array, Numeric]
|
||||||
StringTimeGreaterThan = simple_condition StringTimeGreaterThanOrEqual, '>', "%s > %s"
|
|
||||||
LesserThan = simple_condition Condition, '<', "%s < %s", [Array, Numeric]
|
LesserThan = simple_condition Condition, '<', "%s < %s", [Array, Numeric]
|
||||||
StringTimeLesserThan = simple_condition StringTimeGreaterThanOrEqual, '<', "%s < %s"
|
|
||||||
NotIlike = simple_condition Condition, '!~', "%s NOT ILIKE %s", [Array, String]
|
NotIlike = simple_condition Condition, '!~', "%s NOT ILIKE %s", [Array, String]
|
||||||
Ilike = simple_condition Condition, '~', "%s ILIKE %s", [Array, String]
|
Ilike = simple_condition Condition, '~', "%s ILIKE %s", [Array, String]
|
||||||
Exists = simple_condition Condition, '', '%s IS NOT NULL', [TrueClass]
|
Exists = simple_condition Condition, '', '%s IS NOT NULL', [TrueClass]
|
||||||
|
@ -380,7 +319,7 @@ class SmqlToAR
|
||||||
raise_unless col.exist_in? || SmqlToAR.model_of( col.last_model, col.col), NonExistingSelectableError.new( col)
|
raise_unless col.exist_in? || SmqlToAR.model_of( col.last_model, col.col), NonExistingSelectableError.new( col)
|
||||||
end
|
end
|
||||||
|
|
||||||
def select_build builder, table
|
def build builder, table
|
||||||
@cols.each do |col|
|
@cols.each do |col|
|
||||||
if col.exist_in?
|
if col.exist_in?
|
||||||
col.joins builder, table
|
col.joins builder, table
|
||||||
|
@ -392,7 +331,6 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
alias build select_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class Functions < Condition
|
class Functions < Condition
|
||||||
|
@ -407,11 +345,11 @@ class SmqlToAR
|
||||||
|
|
||||||
class <<self
|
class <<self
|
||||||
def try_parse model, func, args
|
def try_parse model, func, args
|
||||||
self.new model, func, args if self::Name === func and self::Expected.any? {|x| x === args }
|
self.new model, func, args if self::Name === func and self::Expected.any?( &it === args)
|
||||||
end
|
end
|
||||||
|
|
||||||
def inspect
|
def inspect
|
||||||
"#{self.name}( :name=>#{self::Name}, :expected=>#{self::Expected})"
|
"#{self.name}(:name=>#{self::Name}, :expected=>#{self::Expected})"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -441,7 +379,7 @@ class SmqlToAR
|
||||||
super model, func, args
|
super model, func, args
|
||||||
end
|
end
|
||||||
|
|
||||||
def order_build builder, table
|
def build builder, table
|
||||||
return if @args.blank?
|
return if @args.blank?
|
||||||
@args.each do |o|
|
@args.each do |o|
|
||||||
col, o = o
|
col, o = o
|
||||||
|
@ -451,29 +389,26 @@ class SmqlToAR
|
||||||
builder.order t, col.col, o
|
builder.order t, col.col, o
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
alias build order_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class Limit < Function
|
class Limit < Function
|
||||||
Name = :limit
|
Name = :limit
|
||||||
Expected = [Fixnum]
|
Expected = [Fixnum]
|
||||||
|
|
||||||
def limit_build builder, table
|
def build builder, table
|
||||||
raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
|
raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
|
||||||
builder.limit = Array.wrap(@args).first.to_i
|
builder.limit = Array.wrap(@args).first.to_i
|
||||||
end
|
end
|
||||||
alias build limit_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class Offset < Function
|
class Offset < Function
|
||||||
Name = :offset
|
Name = :offset
|
||||||
Expected = [Fixnum]
|
Expected = [Fixnum]
|
||||||
|
|
||||||
def offset_build builder, table
|
def build builder, table
|
||||||
raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
|
raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
|
||||||
builder.offset = Array.wrap(@args).first.to_i
|
builder.offset = Array.wrap(@args).first.to_i
|
||||||
end
|
end
|
||||||
alias build offset_build
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.new model, col, val
|
def self.new model, col, val
|
||||||
|
|
|
@ -32,36 +32,13 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
|
|
||||||
class Aliases < Hash
|
class Aliases < Hash
|
||||||
attr_accessor :counter, :prefix
|
def self.new prefix, *a, &e
|
||||||
|
e ||= lambda do |h, k|
|
||||||
def initialize prefix, *a, &e
|
j = Array.wrap( k).compact
|
||||||
@counter, @prefix = 0, prefix || 'smql'
|
h[k] = h.key?(j) ? h[j] : "#{prefix},#{j.collect( &:to_alias).join( ',')}"
|
||||||
|
end
|
||||||
super *a, &e
|
super *a, &e
|
||||||
end
|
end
|
||||||
|
|
||||||
def format name
|
|
||||||
pre, suf = name.split( ',', 2)
|
|
||||||
return name unless suf
|
|
||||||
pre += ",#{@counter += 1},"
|
|
||||||
l = 60-pre.length
|
|
||||||
n = suf[(suf.length<=l ? 0 : -l)..-1]
|
|
||||||
n == suf ? pre+n : "#{pre},,,#{n}"
|
|
||||||
end
|
|
||||||
|
|
||||||
def name n
|
|
||||||
n.collect( &:to_alias).join ','
|
|
||||||
end
|
|
||||||
|
|
||||||
def [] k
|
|
||||||
n = name k
|
|
||||||
v = super n
|
|
||||||
v = self[k] = format( "#{prefix},#{n}") unless v
|
|
||||||
v
|
|
||||||
end
|
|
||||||
|
|
||||||
def []= k, v
|
|
||||||
super name( k), v
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins, :prefix, :_vid
|
attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins, :prefix, :_vid
|
||||||
|
@ -71,7 +48,7 @@ class SmqlToAR
|
||||||
@prefix = "smql"
|
@prefix = "smql"
|
||||||
@logger = SmqlToAR.logger
|
@logger = SmqlToAR.logger
|
||||||
@table_alias = Aliases.new @prefix
|
@table_alias = Aliases.new @prefix
|
||||||
@_vid, @_where, @_wobs, @model, @quote = 0, SmqlToAR::And[], {}, model, model.connection
|
@_vid, @_where, @_wobs, @model, @quoter = 0, SmqlToAR::And[], {}, model, model.connection
|
||||||
@base_table = [Column::Col.new( model.table_name)]
|
@base_table = [Column::Col.new( model.table_name)]
|
||||||
@table_alias[ @base_table] = @base_table.first
|
@table_alias[ @base_table] = @base_table.first
|
||||||
t = quote_table_name @base_table.first.col
|
t = quote_table_name @base_table.first.col
|
||||||
|
@ -100,7 +77,7 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
|
|
||||||
def quote_column_name name
|
def quote_column_name name
|
||||||
@quote.quote_column_name( name).gsub /"\."/, ','
|
@quoter.quote_column_name( name).gsub /"\."/, ','
|
||||||
end
|
end
|
||||||
|
|
||||||
def quote_table_name name
|
def quote_table_name name
|
||||||
|
@ -108,7 +85,7 @@ class SmqlToAR
|
||||||
when Array, Column::Col then @table_alias[Array.wrap name]
|
when Array, Column::Col then @table_alias[Array.wrap name]
|
||||||
else name.to_s
|
else name.to_s
|
||||||
end
|
end
|
||||||
@quote.quote_table_name name
|
@quoter.quote_table_name( name).gsub /"\."/, ','
|
||||||
end
|
end
|
||||||
|
|
||||||
def column table, name
|
def column table, name
|
||||||
|
@ -116,7 +93,7 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_join orig, pretable, table, prekey, key
|
def build_join orig, pretable, table, prekey, key
|
||||||
"\tLEFT JOIN #{orig} AS #{quote_table_name table}\n\tON #{column pretable, prekey} = #{column table, key}\n"
|
" LEFT JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
|
||||||
end
|
end
|
||||||
|
|
||||||
def sub_joins table, col, model, query
|
def sub_joins table, col, model, query
|
||||||
|
@ -127,33 +104,32 @@ class SmqlToAR
|
||||||
def join_ table, model, query, pretable = nil
|
def join_ table, model, query, pretable = nil
|
||||||
pretable ||= table[0...-1]
|
pretable ||= table[0...-1]
|
||||||
@table_model[ table] = model
|
@table_model[ table] = model
|
||||||
@table_model.rehash
|
premodel = @table_model[ pretable]
|
||||||
premodel = @table_model.find {|k,v| pretable == k }[1]
|
|
||||||
t = @table_alias[ table]
|
t = @table_alias[ table]
|
||||||
pt = quote_table_name table[ 0...-1]
|
pt = quote_table_name table[ 0...-1]
|
||||||
refl = premodel.reflections[table.last.to_sym]
|
refl = premodel.reflections[table.last.to_sym]
|
||||||
case refl
|
case refl
|
||||||
when ActiveRecord::Reflection::ThroughReflection
|
when ActiveRecord::Reflection::ThroughReflection
|
||||||
through = refl.through_reflection
|
through = refl.through_reflection
|
||||||
through_table = table[0...-1]+[Column::Col.new( through.name, table.last.as)]
|
throughtable = table[0...-1]+[Column::Col.new( through.name, table.last.as)]
|
||||||
srctable = through_table+[Column::Col.new( refl.source_reflection.name, table.last.as)]
|
srctable = throughtable+[Column::Col.new( refl.source_reflection.name, table.last.as)]
|
||||||
@table_model[ srctable] = model
|
@table_model[ srctable] = model
|
||||||
@table_alias[ table] = @table_alias[ srctable]
|
@table_alias[ table] = @table_alias[ srctable]
|
||||||
join_ through_table, through.klass, quote_table_name( through.table_name)
|
join_ throughtable, through.klass, quote_table_name( through.table_name)
|
||||||
join_ srctable, refl.klass, query, through_table
|
join_ srctable, refl.klass, query, throughtable
|
||||||
when ActiveRecord::Reflection::AssociationReflection
|
when ActiveRecord::Reflection::AssociationReflection
|
||||||
case refl.macro
|
case refl.macro
|
||||||
when :has_many, :has_one
|
when :has_many, :has_one
|
||||||
@_joins += build_join query, pretable, t, premodel.primary_key, refl.foreign_key
|
@_joins += build_join query, pretable, t, premodel.primary_key, refl.primary_key_name
|
||||||
when :belongs_to
|
when :belongs_to
|
||||||
@_joins += build_join query, pretable, t, refl.foreign_key, premodel.primary_key
|
@_joins += build_join query, pretable, t, refl.primary_key_name, premodel.primary_key
|
||||||
when :has_and_belongs_to_many
|
when :has_and_belongs_to_many
|
||||||
jointable = [Column::Col.new(',')] + table
|
jointable = [','] + table
|
||||||
@_joins += build_join refl.options[:join_table], pretable, @table_alias[ jointable], premodel.primary_key, refl.foreign_key
|
@_joins += build_join refl.options[:join_table], pretable, @table_alias[jointable], premodel.primary_key, refl.primary_key_name
|
||||||
@_joins += build_join query, jointable, t, refl.association_foreign_key, refl.association_primary_key
|
@_joins += build_join query, jointable, t, refl.association_foreign_key, refl.association_primary_key
|
||||||
else raise BuilderError, "Unkown reflection macro: #{refl.macro.inspect}"
|
else raise BuilderError, "Unkown reflection macro: #{refl.macro.inspect}"
|
||||||
end
|
end
|
||||||
else raise BuilderError, "Unkown reflection type: #{refl.class.name} #{refl.macro.inspect}"
|
else raise BuilderError, "Unkown reflection type: #{refl.class.name}"
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
|
@ -219,7 +195,7 @@ class SmqlToAR
|
||||||
|
|
||||||
class SubBuilder < Array
|
class SubBuilder < Array
|
||||||
attr_reader :parent, :_where
|
attr_reader :parent, :_where
|
||||||
delegate :wobs, :joins, :includes, :sub_joins, :vid, :quote_column_name, :quote, :quote_table_name, :column, :to => :parent
|
delegate :wobs, :joins, :includes, :sub_joins, :vid, :quote_column_name, :quoter, :quote_table_name, :column, :to => :parent
|
||||||
|
|
||||||
def initialize parent, tmp = false
|
def initialize parent, tmp = false
|
||||||
@parent = parent
|
@parent = parent
|
||||||
|
@ -248,14 +224,12 @@ class SmqlToAR
|
||||||
def optimize!
|
def optimize!
|
||||||
ext = []
|
ext = []
|
||||||
collect! do |sub|
|
collect! do |sub|
|
||||||
sub = sub.optimize! if sub.kind_of? SubBuilder
|
sub = sub.optimize! if sub.kind_of? Array
|
||||||
if self.class == sub.class
|
if self.class == sub.class
|
||||||
ext.push *sub
|
ext.push *sub
|
||||||
nil
|
nil
|
||||||
elsif sub.blank?
|
elsif sub.blank?
|
||||||
nil
|
nil
|
||||||
elsif 1 == sub.size
|
|
||||||
sub.first
|
|
||||||
else
|
else
|
||||||
sub
|
sub
|
||||||
end
|
end
|
||||||
|
@ -269,22 +243,21 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
def default() SmqlToAR::And end
|
def default() SmqlToAR::And end
|
||||||
def default_new( parent) default.new self, parent, false end
|
def default_new( parent) default.new self, parent, false end
|
||||||
def collect_build_where indent = nil
|
def collect_build_where
|
||||||
indent = (indent||0) + 1
|
collect {|x| x.respond_to?( :build_where) ? x.build_where : x.to_s }
|
||||||
collect {|x| "(#{x.respond_to?( :build_where) ? x.build_where( indent) : x.to_s})" }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class And < SubBuilder
|
class And < SubBuilder
|
||||||
def default; SmqlToAR::Or; end
|
def default; SmqlToAR::Or; end
|
||||||
def build_where indent = nil
|
def build_where
|
||||||
collect_build_where( indent).join " AND\n"+"\t"*(indent||0)
|
collect_build_where.join ' AND '
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class Or < SubBuilder
|
class Or < SubBuilder
|
||||||
def build_where indent = nil
|
def build_where
|
||||||
collect_build_where( indent).join " OR\n"+"\t"*(indent||0)
|
collect_build_where.join ' OR '
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue