aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15392 from arthurnn/move_open_transactionsRafael Mendonça França2014-05-282-4/+4
|\
| * Keep closer to other methods that touch @transactionArthur Neves2014-05-282-4/+4
* | Maintain column order when overriding existing columnsSean Griffin2014-05-281-3/+8
|/
* Merge pull request #15389 from sgrif/sg-property-inheritanceRafael Mendonça França2014-05-281-5/+7
|\
| * Ensure custom properties work correctly with inheritanceSean Griffin2014-05-281-5/+7
* | Merge pull request #15370 from sgrif/sg-type-namespaceRafael Mendonça França2014-05-2838-500/+461
|\ \
| * | Move types to the top level `ActiveRecord` namespaceSean Griffin2014-05-2738-500/+461
* | | Formatting of content from b1db615 [ci skip]Zachary Scott2014-05-281-3/+7
* | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_errorZachary Scott2014-05-281-0/+3
|\ \ \ | |_|/ |/| |
| * | Initial doc for TransactionIsolationError [ci skip]Gaurav Sharma2014-05-281-0/+3
* | | Merge pull request #15387 from sgrif/sg-remove-column-coderSantiago Pastorino2014-05-281-14/+1
|\ \ \ | |/ / |/| |
| * | Remove unused `Column#coder`Sean Griffin2014-05-281-14/+1
| |/
* / pg, keep `hstore` and `json` attributes as `Hash` in @attributes.Yves Senn2014-05-282-2/+14
|/
* Merge pull request #15374 from sgrif/sg-private-propertiesRafael Mendonça França2014-05-2711-24/+12
|\
| * Remove AR Properties from the public APISean Griffin2014-05-2711-24/+12
* | Merge pull request #15269 from arunagw/aa-fixes-8930Rafael Mendonça França2014-05-271-1/+1
|\ \
| * | rake railties:install:migrations respects the order of railtiesArun Agrawal2014-05-271-1/+1
* | | Merge pull request #14834 from al2o3cr/issue14155Aaron Patterson2014-05-272-2/+21
|\ \ \ | |_|/ |/| |
| * | WIP: pass existing joins to construct_join_dependencyMatt Jones2014-05-162-2/+21
* | | Merge pull request #15295 from sgrif/sg-deprecate-decimalsRafael Mendonça França2014-05-273-1/+16
|\ \ \
| * | | Deprecate decimal columns being automatically treated as integersSean Griffin2014-05-273-1/+16
* | | | Merge pull request #15358 from arthurnn/redefine_habtm_fixRafael Mendonça França2014-05-271-24/+23
|\ \ \ \
| * | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-271-24/+23
* | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
* | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \
| * | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
| |/ / / /
* | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
* | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2614-22/+118
|/ / / /
* | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
* | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \
| * | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
* | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2614-33/+71
|\ \ \ \ \
| * | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| * | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| * | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2414-29/+48
| | |/ / / | |/| | |
* | | | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| |/ / / |/| | |
* | | | Refactor the type casting of booleans in MySQLSean Griffin2014-05-262-13/+18
* | | | Remove checks against `column.type` in abstract adapter quotingSean Griffin2014-05-263-34/+21
* | | | Merge pull request #15307 from sgrif/sg-type-cast-for-writeYves Senn2014-05-265-9/+19
|\ \ \ \
| * | | | Add an interface for type objects to control Ruby => SQLSean Griffin2014-05-265-9/+19
* | | | | pg, add missing `:nodoc:` to adapter.Yves Senn2014-05-261-8/+8
* | | | | pg, remove unused code. Use `extract_schema_and_table` instead.Yves Senn2014-05-261-10/+0
| |/ / / |/| | |
* | | | pg, remove duplicated code.Yves Senn2014-05-241-4/+0
* | | | pg, extract schema definitions into separate file.Yves Senn2014-05-242-135/+141
|/ / /
* | | Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimalRafael Mendonça França2014-05-235-35/+32
|\ \ \
| * | | Remove special case in schema dumper for decimal without scaleSean Griffin2014-05-235-35/+32
* | | | Merge pull request #15285 from sergey-alekseev/remove-active-record-where-dup...Rafael Mendonça França2014-05-231-8/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Remove duplicated parameter check on #where!Sergey Alekseev2014-05-231-8/+4