Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nkallen/arel
base: master
...
head fork: miloops/arel
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on May 18, 2009
@miloops miloops Require active_support/core_ext since ActiveRecord don't require it a…
…ny more
b522778
@miloops miloops Don't quote columns when they are not an attribute 4b8526d
Commits on May 26, 2009
@miloops miloops Removed lib to avoid any conflict in merge ae1e0ac
@miloops miloops Merge commit 'brynary/master'
Conflicts:

	lib/arel.rb
	lib/arel/session.rb
c9bbea6
Commits on May 28, 2009
@miloops miloops This should be performed by the engine, if it does not exists, then c…
…reate SQLLiteral not Attribute.
054b010
@miloops miloops Don't quote the table if it isn't a table name. By doing this Arel su…
…pports using custom SQL FROM like: edges USE INDEX(unique_edge_index)
dc09a63
@miloops miloops Allow expressions on literal SQL fragments c55226b
Commits on Jun 02, 2009
@miloops miloops Return delete result instead Arel object 324f265
Commits on Jun 10, 2009
@miloops miloops Allow strings as update assignments 3e6ad6e
Commits on Jun 23, 2009
@miloops miloops Build valid SQL query for SQLite3 and PostgreSQL when updating record…
…s with limited conditions
ae0c58f
@miloops miloops Build valid SQL query when using PostreSQL with given order and DISTINCT
ON clause. TODO: refactoring to clean up components.
a948619
@miloops miloops If the class or method isn't defined use "id" as primary_key. 9781169
Commits on Jul 01, 2009
@miloops miloops Allow SQL strings to insert query. Insert should better return engine…
…'s result.
808b9e9
Commits on Aug 06, 2009
@brynary brynary Adding jeweler for gem management 53054c0
@brynary brynary Regenerated gemspec for version 0.1.0 019f35a
Commits on Aug 10, 2009
Lee Bankewitz Bug fix: Don't use #delegate to declare delegations when intentionall…
…y delegating to nil

This accounts for a behavior change after Rails 2.3
724b486
Commits on Aug 14, 2009
@miloops miloops Allow joining a StringJoin with another join relation. 5dcbca2
@miloops miloops Accept Arel::Value in hash values and treat them properly. 3d747a5
Commits on Aug 23, 2009
@miloops miloops REAME updated: remove whitespaces, fix invalid join in query output. 755a7ce
Commits on Sep 14, 2009
@jeremy jeremy Require active_support and active_record by name in LOAD_PATH instead…
… of gem name (deprecated)
32af162
@jeremy jeremy Remove explicit rubygems require. Use Active Support provided by Acti…
…ve Record. Add self to load path after requiring Active Record.
a727cef
@jeremy jeremy Submodule rails master rather than rely on gems bad67f8
@jeremy jeremy Use load path rather than relative path for spec_helper requires. Als…
…o fixes specs on Ruby 1.9 since . is no longer in the load path.
7a7ee72
@miloops miloops Cherry pick AS extensions. 8852db7
Commits on Sep 20, 2009
@brynary brynary Merge remote branch 'miloops/master' into miloops
Conflicts:
	spec/connections/mysql_connection.rb
	spec/connections/postgresql_connection.rb
	spec/connections/sqlite3_connection.rb
58920bc
@brynary brynary Whitespace 72df966
@brynary brynary When Arel is loaded the $LOAD_PATH should already be set properly, so…
… don't modify it
d343fdd
@brynary brynary Remove unnecessary code from Rakefile 55ab59e
@brynary brynary Gracefully handle case where RSpec is not installed in Rakefile dbb2dcf
@brynary brynary Declare dependencies on ActiveRecord and ActiveSupport in Rakefile 7e3fe31
@brynary brynary Add description to Rakefile 41ddc9d
@brynary brynary Turn on Ruby warnings when running specs 6690e3c
@brynary brynary Fix almost all Ruby warnings during spec suite 927d8b8
Commits on Oct 01, 2009
@brynary brynary Autoload Arel::Session 836a577
@brynary brynary Move extensions directories to core_extensions 52e8aff
@brynary brynary Create Predicates module to match directory structure bcd8ffa
@brynary brynary Pull primitives up one level 71d65b7
@brynary brynary Whitespace 2824d7c
@brynary brynary Adding spec.opts 0da3bbe
@brynary brynary Removing unused params from #to_sql methods on writes 6d093fb
Commits on Oct 14, 2009
@jeremy jeremy remove lib/arel/.DS_Store from gemspec b99b4e1
Commits on Oct 20, 2009
@jeremy jeremy Bump version 0.1.0 -> 0.1.1 to distinguish from older, already-releas…
…ed gem
35acdc9
@brynary brynary Merge branch 'rails/master' 5b4c964
Commits on Oct 28, 2009
@brynary brynary Dropping Jeweler in favor of some simple Thor tasks (for Gemcutter) efc167d
@brynary brynary Generating newly formatted gemspec 492f96e
@brynary brynary Don't declare ActiveRecord gem dependency for now 42aa39b
@brynary brynary Correct version number for prerelease Rails components. Note the addi…
…tional period
a923cf7
@brynary brynary Need to add Rails components to $LOAD_PATH to require "arel" reliably 19d7ee3
Commits on Nov 03, 2009
@jeremy jeremy Spoof a version bump to work around Bundler using gem instead of git …
…checkout
567a142
Commits on Nov 10, 2009
@brynary brynary Ruby 1.9: the constants must be qualified 976999c
@brynary brynary Switch from rr to RSpec mocks. rr has issues on 1.9.2pre 130188e
@brynary brynary Ruby 1.9: Improve the way we spec this 2eea340
@brynary brynary Rake check_dependencies is dead. Don't try to run it 34e35c7
@brynary brynary Ruby 1.9: Sort attributes deterministically so specs always pass 4dcfe67
@jeremy jeremy Merge commit 'brynary/master' 3718cda
@brynary brynary History 9544bb6
@brynary brynary This is 0.2.pre now 627bce9
@brynary brynary Add History.txt to RDoc 3dbdaa3
@brynary brynary Ruby 1.9: Array#to_s behaves like inspect now, so we don't want to us…
…e it here (needs spec!)
0faeb50
Commits on Dec 23, 2009
@miloops miloops Don't split sql logging across multiple lines. b62a1b6
Commits on Dec 24, 2009
@miloops miloops Don't require ActiveRecord, let Arel work with any other ORM and engines
beyond RDBMS.
956b326