aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/active_relation/extensions/array.rb4
-rw-r--r--lib/active_relation/extensions/class.rb7
-rw-r--r--lib/active_relation/extensions/hash.rb12
-rw-r--r--lib/active_relation/extensions/object.rb16
-rw-r--r--lib/active_relation/predicates.rb2
-rw-r--r--lib/active_relation/primitives.rb1
-rw-r--r--lib/active_relation/primitives/scalar.rb25
-rw-r--r--lib/active_relation/relations/insertion.rb2
-rw-r--r--lib/active_relation/relations/order.rb5
-rw-r--r--lib/active_relation/relations/relation.rb34
-rw-r--r--lib/active_relation/relations/rename.rb4
-rw-r--r--lib/active_relation/relations/update.rb4
-rw-r--r--lib/active_relation/sql.rb2
13 files changed, 70 insertions, 48 deletions
diff --git a/lib/active_relation/extensions/array.rb b/lib/active_relation/extensions/array.rb
index 5b6d6d6abd..aa4354a78a 100644
--- a/lib/active_relation/extensions/array.rb
+++ b/lib/active_relation/extensions/array.rb
@@ -2,4 +2,8 @@ class Array
def to_hash
Hash[*flatten]
end
+
+ def to_sql(strategy = nil)
+ "(#{collect(&:to_sql).join(', ')})"
+ end
end \ No newline at end of file
diff --git a/lib/active_relation/extensions/class.rb b/lib/active_relation/extensions/class.rb
deleted file mode 100644
index 72b3bf0c15..0000000000
--- a/lib/active_relation/extensions/class.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
- def memoize(method)
- define_method "#{method}_with_memoization" do |*args|
- end
- alias_method_chain method, :memoization
- end
-end \ No newline at end of file
diff --git a/lib/active_relation/extensions/hash.rb b/lib/active_relation/extensions/hash.rb
index 50864912bf..a33ace5738 100644
--- a/lib/active_relation/extensions/hash.rb
+++ b/lib/active_relation/extensions/hash.rb
@@ -1,11 +1,11 @@
class Hash
- def alias(&block)
- inject({}) do |aliased, (key, value)|
- aliased.merge(yield(key) => value)
- end
+ def bind(relation)
+ descend { |x| x.bind(relation) }
end
- def to_sql(strategy = nil)
- "(#{values.collect(&:to_sql).join(', ')})"
+ def descend(&block)
+ inject({}) do |descendent, (key, value)|
+ descendent.merge(yield(key) => yield(value))
+ end
end
end \ No newline at end of file
diff --git a/lib/active_relation/extensions/object.rb b/lib/active_relation/extensions/object.rb
index b0c7ada999..d13cf9aabb 100644
--- a/lib/active_relation/extensions/object.rb
+++ b/lib/active_relation/extensions/object.rb
@@ -1,18 +1,6 @@
-class Object
- def qualify
- self
- end
-
+class Object
def bind(relation)
- self
- end
-
- def to_sql(strategy = self.strategy)
- strategy.scalar self
- end
-
- def strategy
- ActiveRelation::Sql::Scalar.new(ActiveRelation::Table.engine)
+ ActiveRelation::Scalar.new(self, relation)
end
def metaclass
diff --git a/lib/active_relation/predicates.rb b/lib/active_relation/predicates.rb
index ddc6eab02b..ba926a86e5 100644
--- a/lib/active_relation/predicates.rb
+++ b/lib/active_relation/predicates.rb
@@ -84,7 +84,7 @@ module ActiveRelation
class RelationInclusion < Binary
alias_method :relation, :operand2
-
+
protected
def predicate_sql
'IN'
diff --git a/lib/active_relation/primitives.rb b/lib/active_relation/primitives.rb
index 2ac157297e..7629256034 100644
--- a/lib/active_relation/primitives.rb
+++ b/lib/active_relation/primitives.rb
@@ -1,3 +1,4 @@
require 'active_relation/primitives/attribute'
+require 'active_relation/primitives/scalar'
require 'active_relation/primitives/expression'
diff --git a/lib/active_relation/primitives/scalar.rb b/lib/active_relation/primitives/scalar.rb
new file mode 100644
index 0000000000..fa88404ee3
--- /dev/null
+++ b/lib/active_relation/primitives/scalar.rb
@@ -0,0 +1,25 @@
+module ActiveRelation
+ class Scalar
+ attr_reader :value, :relation
+
+ def initialize(value, relation)
+ @value, @relation = value, relation
+ end
+
+ def to_sql(strategy = self.strategy)
+ strategy.scalar value
+ end
+
+ def strategy
+ ActiveRelation::Sql::Scalar.new(relation.engine)
+ end
+
+ def ==(other)
+ value == other.value
+ end
+
+ def qualify
+ self
+ end
+ end
+end \ No newline at end of file
diff --git a/lib/active_relation/relations/insertion.rb b/lib/active_relation/relations/insertion.rb
index dd5b8ec530..16fe3d5f46 100644
--- a/lib/active_relation/relations/insertion.rb
+++ b/lib/active_relation/relations/insertion.rb
@@ -11,7 +11,7 @@ module ActiveRelation
"INSERT",
"INTO #{table_sql}",
"(#{record.keys.collect(&:to_sql).join(', ')})",
- "VALUES #{record.to_sql}"
+ "VALUES #{record.values.to_sql}"
].join("\n")
end
diff --git a/lib/active_relation/relations/order.rb b/lib/active_relation/relations/order.rb
index e6395aecd7..6949b3acf7 100644
--- a/lib/active_relation/relations/order.rb
+++ b/lib/active_relation/relations/order.rb
@@ -7,8 +7,9 @@ module ActiveRelation
end
def ==(other)
- relation == other.relation and
- orders == other.orders
+ self.class == other.class and
+ relation == other.relation and
+ orders == other.orders
end
def descend(&block)
diff --git a/lib/active_relation/relations/relation.rb b/lib/active_relation/relations/relation.rb
index 3d4ff6613c..1c97cc7035 100644
--- a/lib/active_relation/relations/relation.rb
+++ b/lib/active_relation/relations/relation.rb
@@ -42,11 +42,11 @@ module ActiveRelation
end
def select(*predicates)
- Selection.new(self, *predicates)
+ Selection.new(self, *predicates.collect {|p| p.bind(self)})
end
def project(*attributes)
- Projection.new(self, *attributes)
+ Projection.new(self, *attributes.collect {|a| a.bind(self)})
end
def as(aliaz)
@@ -54,7 +54,7 @@ module ActiveRelation
end
def order(*attributes)
- Order.new(self, *attributes)
+ Order.new(self, *attributes.collect {|a| a.bind(self)})
end
def rename(attribute, aliaz)
@@ -67,11 +67,11 @@ module ActiveRelation
module Writes
def insert(record)
- session.create Insertion.new(self, record); self
+ session.create Insertion.new(self, record.bind(self)); self
end
def update(assignments)
- session.update Update.new(self, assignments); self
+ session.update Update.new(self, assignments.bind(self)); self
end
def delete
@@ -108,14 +108,14 @@ module ActiveRelation
def to_sql(strategy = Sql::Relation.new(engine))
strategy.select [
- "SELECT #{attributes.collect{ |a| a.to_sql(Sql::Projection.new(engine)) }.join(', ')}",
- "FROM #{table_sql}",
- (joins unless joins.blank?),
- ("WHERE #{selects.collect{|s| s.to_sql(Sql::Selection.new(engine))}.join("\n\tAND ")}" unless selects.blank?),
- ("ORDER BY #{orders.collect(&:to_sql)}" unless orders.blank?),
- ("GROUP BY #{groupings.collect(&:to_sql)}" unless groupings.blank?),
- ("LIMIT #{limit.to_sql}" unless limit.blank?),
- ("OFFSET #{offset.to_sql}" unless offset.blank?)
+ "SELECT #{attributes.collect{ |a| a.to_sql(Sql::Projection.new(engine)) }.join(', ')}",
+ "FROM #{table_sql}",
+ (joins unless joins.blank? ),
+ ("WHERE #{selects.collect{|s| s.to_sql(Sql::Selection.new(engine))}.join("\n\tAND ")}" unless selects.blank? ),
+ ("ORDER BY #{orders.collect(&:to_sql)}" unless orders.blank? ),
+ ("GROUP BY #{groupings.collect(&:to_sql)}" unless groupings.blank? ),
+ ("LIMIT #{limit}" unless limit.blank? ),
+ ("OFFSET #{offset}" unless offset.blank? )
].compact.join("\n"), self.alias
end
alias_method :to_s, :to_sql
@@ -127,6 +127,14 @@ module ActiveRelation
def attribute_for_attribute(attribute)
attributes.detect { |a| a =~ attribute }
end
+
+ def bind(relation)
+ self
+ end
+
+ def strategy
+ Sql::Predicate.new(engine)
+ end
def attributes; [] end
def selects; [] end
diff --git a/lib/active_relation/relations/rename.rb b/lib/active_relation/relations/rename.rb
index 9a0e5552c7..ac5484bfff 100644
--- a/lib/active_relation/relations/rename.rb
+++ b/lib/active_relation/relations/rename.rb
@@ -15,7 +15,7 @@ module ActiveRelation
end
def attributes
- relation.attributes.collect(&method(:baptize))
+ relation.attributes.collect(&method(:christen))
end
def descend(&block)
@@ -23,7 +23,7 @@ module ActiveRelation
end
private
- def baptize(attribute)
+ def christen(attribute)
(attribute =~ self.attribute ? attribute.as(pseudonym) : attribute).bind(self) rescue nil
end
end
diff --git a/lib/active_relation/relations/update.rb b/lib/active_relation/relations/update.rb
index 8909ee80a0..c50919af3e 100644
--- a/lib/active_relation/relations/update.rb
+++ b/lib/active_relation/relations/update.rb
@@ -9,7 +9,9 @@ module ActiveRelation
def to_sql(strategy = nil)
[
"UPDATE #{table_sql} SET",
- assignments.inject([]) { |assignments, (attribute, value)| assignments << "#{attribute.to_sql} = #{value.to_sql}" }.join(" "),
+ assignments.inject("") do |assignments, (attribute, value)|
+ assignments << " #{attribute.to_sql} = #{value.to_sql}"
+ end,
("WHERE #{selects.collect(&:to_sql).join('\n\tAND ')}" unless selects.blank?)
].join("\n")
end
diff --git a/lib/active_relation/sql.rb b/lib/active_relation/sql.rb
index a5701ca8cd..99cfc66383 100644
--- a/lib/active_relation/sql.rb
+++ b/lib/active_relation/sql.rb
@@ -20,7 +20,7 @@ module ActiveRelation
end
def select(select_sql, aliaz)
- "(#{select_sql})" + (aliaz ? " AS #{quote_column_name(aliaz)}" : "")
+ "(#{select_sql})" + (aliaz ? " AS #{quote(aliaz)}" : "")
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 21:06:50 +0000