aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20041 from akshay-vishnoi/sqlite_collationRafael Mendonça França2015-05-282-4/+66
|\
| * Add collation support for string and text columns in SQLite3Akshay Vishnoi2015-05-282-4/+66
* | Allow Relation#compact using delegationJordan Raine2015-05-281-1/+1
|/
* Merge pull request #20171 from georgeclaghorn/enums-in-fixturesRafael Mendonça França2015-05-271-0/+5
|\
| * Resolve enums in test fixturesGeorge Claghorn2015-05-271-0/+5
* | Merge pull request #19886 from henders/henders/reload_wipe_query_cacheRafael Mendonça França2015-05-271-1/+3
|\ \
| * | Cause ActiveRecord::Base::reload to also ignore the QueryCache.Shane Hender2015-04-281-1/+3
* | | Merge pull request #17654 from kamipo/strict_mode_explicitlyRafael Mendonça França2015-05-271-2/+4
|\ \ \ | |_|/ |/| |
| * | If specify `strict: :default` explicitly, do not set sql_mode.Ryuta Kamizono2015-05-261-2/+4
* | | Merge pull request #20269 from wojobucco/masterRafael Mendonça França2015-05-271-0/+1
|\ \ \ | |/ / |/| |
| * | Changed mysqldump to include sprocs and functionsJonathan Worek2015-05-221-0/+1
* | | add `extend` option on `has_and_belongs_to_many`.keepcosmos2015-05-261-1/+1
* | | deprecate `Relation#uniq` use `Relation#distinct` instead.Yves Senn2015-05-263-3/+5
* | | Remove `.superclass_delegating_accessor`. Refer #14271Akshay Vishnoi2015-05-241-1/+0
|/ /
* | "maybe" => "may be"Waynn Lue2015-05-211-1/+1
* | Merge pull request #20219 from karanarora/Typo-fixSantiago Pastorino2015-05-201-1/+1
|\ \
| * | typo fix [ci skip]karanarora2015-05-201-1/+1
* | | Merge pull request #20217 from amitsuroliya/fix_netaddr_linkArun Agrawal2015-05-201-1/+1
|\ \ \
| * | | Fix NetAddr link [ci skip]amitkumarsuroliya2015-05-201-1/+1
* | | | Updated postgresql documentation link to use latest version [ci skip]Ronak Jangir2015-05-202-5/+5
|/ / /
* | | parent_reflection should store only a reflection objectAaron Patterson2015-05-192-7/+9
* | | Remove unused already requireRyuta Kamizono2015-05-193-8/+0
* | | Remove `require 'arel/visitors/bind_visitor'`Ryuta Kamizono2015-05-193-4/+0
* | | Merge pull request #20212 from kamipo/avoid_heredocRafael Mendonça França2015-05-191-20/+5
|\ \ \
| * | | Avoid the heredoc in one line queries and simple queriesRyuta Kamizono2015-05-191-20/+5
| |/ /
* / / Eliminate the duplication code of `StatementPool`Ryuta Kamizono2015-05-194-92/+36
|/ /
* | Merge pull request #20175 from eugeneius/copy_schema_cache_after_forkRafael Mendonça França2015-05-181-1/+3
|\ \
| * | Add schema cache to new connection pool after forkEugene Kenny2015-05-171-1/+3
* | | Merge pull request #20187 from yui-knk/refactor/type_intRafael Mendonça França2015-05-181-3/+6
|\ \ \
| * | | Refactoring `ActiveRecord::Type::Integer` limityui-knk2015-05-181-3/+6
* | | | Merge pull request #20192 from kamipo/divide_to_column_options_handling_methodsRafael Mendonça França2015-05-182-10/+34
|\ \ \ \
| * | | | Divide methods for handling column options separatelyRyuta Kamizono2015-05-182-10/+34
| | |/ / | |/| |
* | | | Merge pull request #20190 from kamipo/fix_serial_with_quoted_sequence_nameRafael Mendonça França2015-05-181-1/+2
|\ \ \ \
| * | | | Fix `serial?` with quoted sequence nameRyuta Kamizono2015-05-181-1/+2
| |/ / /
* | | | Merge pull request #20082 from sh6khan/nested-attributes-docsEileen M. Uchitelle2015-05-181-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | docs for updating nested attributes while creating parent record [cish6khan2015-05-181-0/+5
* | | | better `add_reference` documentation. [ci skip]Yves Senn2015-05-182-20/+18
| |/ / |/| |
* | | Merge pull request #14938 from thedarkone/pool-lock-fixMatthew Draper2015-05-163-86/+407
|\ \ \
| * | | AR::ConPool - remove synchronization around connection cache.thedarkone2015-05-142-80/+304
| * | | AR::ConPool - establish connections outside of critical section.thedarkone2015-05-141-27/+101
| * | | AR::ConPool - reduce post checkout critical section.thedarkone2015-05-142-13/+35
* | | | Remove redundant require 'set' linesMehmet Emin İNAÇ2015-05-153-3/+0
* | | | Merge pull request #20113 from claudiob/remove-rails31-refsYves Senn2015-05-142-18/+3
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Remove comments about Rails 3.1claudiob2015-05-112-18/+3
* | | | Merge pull request #20121 from matthewrudy/remove-sanitize-hashSean Griffin2015-05-131-3/+1
|\ \ \ \
| * | | | remove documentation for sanitize_sql_for_conditions with a HashMatthew Rudy Jacobs2015-05-121-2/+1
| * | | | Remove call to sanitize_sql_hash_for_conditionsMatthew Rudy Jacobs2015-05-121-1/+0
| |/ / /
* | | | invalid sti error message contains the full class name.Yves Senn2015-05-131-1/+1
* | | | Merge branch 'sti-subclass-from-attributes' of https://github.com/agrobbin/ra...Yves Senn2015-05-131-6/+8
|\ \ \ \
| * | | | allow setting of a demodulized class name when using STIAlex Robbin2015-05-111-6/+8