aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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-093-12/+7
* 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-096-69/+89
|\
| * Drop in @jeremy's new database.yml template textMatthew Draper2014-04-092-1/+9
| * Don't deprecate after allMatthew Draper2014-04-092-27/+11
| * Less ambition, more deprecationMatthew Draper2014-04-092-75/+27
| * Ensure we correctly and immediately load all ENV entriesMatthew Draper2014-04-081-0/+21
| * Give a deprecation message even when the lookup failsMatthew Draper2014-04-082-4/+6
| * 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
| * Test DATABASE_URL has precendance over DATABASE_URL_#{environment}Rafael Mendonça França2014-04-081-0/+9
| * Make sure DEFAULT_URL only override current environment databaseRafael Mendonça França2014-04-082-10/+30
| * Only apply DATABASE_URL for Rails.envMatthew Draper2014-04-082-45/+40
| * 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-073-11/+35
* | working against arel/collector branchAaron Patterson2014-04-095-7/+9
* | 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-0797-864/+1525
|\|
| * Merge pull request #14634 from laurocaetano/fix_reorderRafael Mendonça França2014-04-074-7/+26
| |\
| | * Build the reverse_order on its proper method.Lauro Caetano2014-04-074-7/+26
| * | remove check for present? from delete_alleileencodes2014-04-071-2/+2
| |/
| * Merge pull request #14632 from matthewd/escape_byteaRafael Mendonça França2014-04-072-2/+19
| |\
| | * Use connection-specific bytea escapingMatthew Draper2014-04-082-2/+19
| * | Ignore order when doing count.Lauro Caetano2014-04-072-1/+15
| * | Merge pull request #14609 from evanwhalen/enums_inheritanceRafael Mendonça França2014-04-073-4/+28
| |\ \ | | |/ | |/|
| | * make enums distinct per classEvan Whalen2014-04-073-4/+28
| * | fix CollectionProxy delete_all documentationeileencodes2014-04-061-6/+1
| |/
| * Merge pull request #14579 from senny/pg/remove_string_limitRafael Mendonça França2014-04-047-5/+19
| |\
| | * test, show current adapter behavior for `add_column limit: nil`.Yves Senn2014-04-041-0/+8
| | * PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms Mikoss &...Yves Senn2014-04-046-5/+11
| * | Fix the test defining the models in the right placeRafael Mendonça França2014-04-044-15/+16
| * | Add CHANGELOG entry for #11650 [ci skip]Rafael Mendonça França2014-04-041-0/+6
| * | Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-049-19/+37
| |\ \
| | * | [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-209-19/+37
| * | | Merge pull request #14562 from jefflai2/collection_proxyRafael Mendonça França2014-04-044-0/+23
| |\ \ \
| | * | | CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-024-0/+23
| * | | | Remove unused variableRafael Mendonça França2014-04-041-1/+1
| * | | | Prevent state leak in test.Guo Xiang Tan2014-04-031-17/+16
| | |_|/ | |/| |
| * | | Block a few default Class methods as scope name.Arthur Neves2014-04-034-1/+15
| * | | Merge pull request #14572 from laurocaetano/with_options_and_scopeRafael Mendonça França2014-04-035-0/+23
| |\ \ \
| | * | | Fix error when using `with_options` with lambda.Lauro Caetano2014-04-035-0/+23
| * | | | Merge pull request #14569 from matthewd/sqlite_relative_deprecatedRafael Mendonça França2014-04-035-24/+64
| |\ \ \ \
| | * | | | Complete change of `sqlite3:///` path handlingMatthew Draper2014-04-033-17/+11
| | * | | | Revise 'sqlite3:' URL handling for smoother upgradesMatthew Draper2014-04-035-25/+88
| * | | | | Merge pull request #14570 from matthewd/uri_deprecation_warningRafael Mendonça França2014-04-032-24/+76
| |\ \ \ \ \ | | |_|/ / / | |/| | | |