aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* tests still pass when caching unprepared statementsAaron Patterson2014-04-091-1/+0
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-091-1/+1
|\
| * The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-091-1/+1
* | remove the bind visitor since the collector handles substituting bind valuesAaron Patterson2014-04-091-6/+2
* | push the collectors up to the abstract adapterAaron Patterson2014-04-093-40/+22
* | sqlite3 tests passing againAaron Patterson2014-04-091-7/+8
* | mysql tests are passing againAaron Patterson2014-04-091-1/+7
* | all tests passing on mysql2Aaron Patterson2014-04-091-1/+0
* | working against arel/collector branchAaron Patterson2014-04-094-19/+12
* | fix bind collecting for mysqlAaron Patterson2014-04-092-3/+22
* | add a bind collector, remove the bind visitorAaron Patterson2014-04-093-15/+24
* | remove the bind substitution visitor. to_sql should never return bind valuesAaron Patterson2014-04-092-9/+6
* | use the compile method so we do not have to specify the collectors in this caseAaron Patterson2014-04-092-4/+2
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-094-36/+16
|\|
| * Drop in @jeremy's new database.yml template textMatthew Draper2014-04-091-1/+1
| * Don't deprecate after allMatthew Draper2014-04-091-16/+2
| * Less ambition, more deprecationMatthew Draper2014-04-091-16/+16
| * Give a deprecation message even when the lookup failsMatthew Draper2014-04-081-2/+2
| * Rearrange the config merger some moreMatthew Draper2014-04-081-19/+16
| * entry is always a HashRafael Mendonça França2014-04-081-1/+1
| * Check env_url only onceRafael Mendonça França2014-04-081-2/+7
| * Only call DEFAULT_ENV proc one timeRafael Mendonça França2014-04-081-2/+5
| * Make sure DEFAULT_URL only override current environment databaseRafael Mendonça França2014-04-081-1/+1
| * Only apply DATABASE_URL for Rails.envMatthew Draper2014-04-081-28/+14
| * Ensure we are looking with string keysGodfrey Chan2014-04-071-1/+1
| * Follow up to bbe7fe41 to fix enum leakage across classes.Godfrey Chan2014-04-072-4/+7
* | working against arel/collector branchAaron Patterson2014-04-094-4/+6
* | wrap the literal value before handing it to arelAaron Patterson2014-04-072-4/+6
* | where_values should extract the value of the Casted nodeAaron Patterson2014-04-071-1/+7
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-0742-490/+528
|\|
| * Merge pull request #14634 from laurocaetano/fix_reorderRafael Mendonça França2014-04-072-4/+3
| |\
| | * Build the reverse_order on its proper method.Lauro Caetano2014-04-072-4/+3
| * | remove check for present? from delete_alleileencodes2014-04-071-2/+2
| |/
| * Merge pull request #14632 from matthewd/escape_byteaRafael Mendonça França2014-04-071-2/+2
| |\
| | * Use connection-specific bytea escapingMatthew Draper2014-04-081-2/+2
| * | Ignore order when doing count.Lauro Caetano2014-04-071-1/+1
| * | Merge pull request #14609 from evanwhalen/enums_inheritanceRafael Mendonça França2014-04-071-4/+6
| |\ \ | | |/ | |/|
| | * make enums distinct per classEvan Whalen2014-04-071-4/+6
| * | fix CollectionProxy delete_all documentationeileencodes2014-04-061-6/+1
| |/
| * Merge pull request #14579 from senny/pg/remove_string_limitRafael Mendonça França2014-04-042-2/+2
| |\
| | * PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms Mikoss &...Yves Senn2014-04-042-2/+2
| * | Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-048-19/+19
| |\ \
| | * | [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-208-19/+19
| * | | Merge pull request #14562 from jefflai2/collection_proxyRafael Mendonça França2014-04-041-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-021-0/+4
| * | | Block a few default Class methods as scope name.Arthur Neves2014-04-031-1/+3
| * | | Merge pull request #14569 from matthewd/sqlite_relative_deprecatedRafael Mendonça França2014-04-031-17/+30
| |\ \ \
| | * | | Complete change of `sqlite3:///` path handlingMatthew Draper2014-04-031-15/+1
| | * | | Revise 'sqlite3:' URL handling for smoother upgradesMatthew Draper2014-04-031-18/+45
| * | | | Merge pull request #14570 from matthewd/uri_deprecation_warningRafael Mendonça França2014-04-031-24/+28
| |\ \ \ \