aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-141-1/+1
|\
| * Fixed typo.chrismcc2012-06-111-1/+1
* | removes item in the Active Record CHANGELOGXavier Noria2012-06-141-2/+0
* | Need a assert here in testsArun Agrawal2012-06-121-2/+2
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
|\ \
| * | Don't assign the attributes if the list is empty.Aurelian Oancea2012-06-082-1/+5
* | | Create hstore extension when building PostgreSQL databases.kennyj2012-06-121-0/+10
* | | Remove warnings and unused codeRafael Mendonça França2012-06-112-7/+2
* | | No need to cache table metadata in advance now that #6683 was merged.Rafael Mendonça França2012-06-112-16/+0
* | | Merge pull request #6492 from pmahoney/fair-connection-pool2Rafael Mendonça França2012-06-115-38/+286
|\ \ \
| * | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-254-38/+282
| * | | Cache metadata in advance to avoid extra sql statements while testing.Yasuo Honda2012-05-251-0/+7
* | | | Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125Rafael Mendonça França2012-06-111-1/+1
|\ \ \ \
| * | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6Akira Matsuda2012-06-121-1/+1
* | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
|/ / / /
* | | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
* | | | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-102-1/+8
* | | | Remove bundle exec from the exception messageRafael Mendonça França2012-06-101-1/+1
* | | | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-102-1/+7
* | | | Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* | | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
|\ \ \ \
| * | | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-102-5/+14
* | | | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / / /
* | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
* | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-103-4/+7
* | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+54
|\ \ \ \
| * | | | raise error for pending migration schneems2012-06-093-4/+35
| * | | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
* | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ \
| * | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
| | |_|/ / | |/| | |
* | | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
* | | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
* | | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|/ / / /
* | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
* | | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \ \ \
| * | | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
* | | | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
* | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-1/+1
* | | | | stop `to_s`ing method namesAkira Matsuda2012-06-062-3/+2
* | | | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| | |_|/ | |/| |
* | | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
* | | | Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/ / /
* | | a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
* | | minor comment revisionXavier Noria2012-06-011-1/+1
* | | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+27
* | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
* | | unused method argumentsAkira Matsuda2012-06-011-7/+6
* | | modulize AR::NullRelationAkira Matsuda2012-06-013-4/+9
* | | Merge branch 'master-sec'Aaron Patterson2012-05-313-3/+37
|\ \ \