| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
lib/arel/algebra/extensions/object.rb
lib/arel/algebra/primitives/value.rb
lib/arel/engines/memory/relations.rb
lib/arel/engines/sql/formatters.rb
lib/arel/engines/sql/primitives.rb
spec/arel/unit/relations/alias_spec.rb
spec/arel/unit/relations/array_spec.rb
spec/arel/unit/relations/order_spec.rb
|
|
|
|
|
|
|
|
| |
Conflicts:
lib/arel/algebra/primitives/attribute.rb
lib/arel/algebra/primitives/expression.rb
spec/arel/unit/primitives/expression_spec.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
lib/arel/engine.rb
lib/arel/extensions/object.rb
lib/arel/predicates.rb
lib/arel/primitives/attribute.rb
lib/arel/primitives/expression.rb
lib/arel/primitives/value.rb
lib/arel/relations/operations/join.rb
lib/arel/relations/relation.rb
lib/arel/relations/utilities/externalization.rb
lib/arel/relations/utilities/nil.rb
lib/arel/relations/writes/delete.rb
lib/arel/relations/writes/insert.rb
lib/arel/relations/writes/update.rb
spec/arel/unit/relations/skip_spec.rb
spec/arel/unit/relations/take_spec.rb
spec/spec_helper.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
doc/TODO
lib/arel/relations/relation.rb
lib/arel/relations/writes/delete.rb
lib/arel/relations/writes/insert.rb
lib/arel/relations/writes/update.rb
lib/arel/session.rb
spec/arel/unit/relations/delete_spec.rb
spec/arel/unit/relations/insert_spec.rb
spec/arel/unit/relations/relation_spec.rb
spec/arel/unit/relations/update_spec.rb
spec/arel/unit/session/session_spec.rb
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
- the solution is currently ugly, but i have an idea how to clean it up
|
| |
|
| |
|
|
|
|
|
| |
- alias to_sql to to_s
- added column_for to join (untested)
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
- implementation is a bit complex, but i can't think of anything simpler
|
| |
|
| |
|
|
|
|
| |
- blank checks
|
| |
|
|
|