Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rm-remove-mocha' | Rafael Mendonça França | 2014-07-19 | 1 | -0/+2 |
|\ | |||||
| * | Stop requiring mocha automatically | Rafael Mendonça França | 2014-07-19 | 1 | -0/+2 |
* | | create_join_table uses same logic as HABTM reflections | Stefan Kanev | 2014-07-18 | 1 | -0/+24 |
* | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method | Matthew Draper | 2014-07-18 | 1 | -2/+20 |
|\ \ | |||||
| * | | Dont swallow errors when bad alias_method | Arthur Neves | 2014-06-24 | 1 | -2/+20 |
* | | | Disable some tests on SQLite | Rafael Mendonça França | 2014-07-17 | 1 | -77/+77 |
* | | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_cast | Rafael Mendonça França | 2014-07-17 | 2 | -7/+33 |
|\ \ \ | |||||
| * | | | Fix decimal_test module and add new test for object responding to to_d | Mariano Valles | 2014-07-16 | 1 | -6/+15 |
| * | | | Fix case statement to use ::Numeric and ::String | Mariano Valles | 2014-07-16 | 2 | -17/+24 |
| * | | | Change class evaluation for Rationals in cast_value | Mariano Valles | 2014-07-16 | 1 | -1/+1 |
| * | | | Fix rational to decimal on type_cast_from_user | Mariano Valles | 2014-07-16 | 1 | -0/+10 |
* | | | | Merge pull request #16196 from yahonda/mysql_restrict_test | Matthew Draper | 2014-07-17 | 2 | -8/+6 |
|\ \ \ \ | |||||
| * | | | | Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" | Yasuo Honda | 2014-07-17 | 2 | -8/+6 |
* | | | | | Merge pull request #15944 from seuros/uuid | Rafael Mendonça França | 2014-07-16 | 1 | -0/+37 |
|\ \ \ \ \ | |||||
| * | | | | | Treat invalid uuid as nil | Abdelkader Boudih | 2014-07-14 | 1 | -0/+37 |
* | | | | | | Merge pull request #16183 from goddamnhippie/fix-psych-warning | Rafael Mendonça França | 2014-07-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implement required #encode_with | Gustavo Beathyate | 2014-07-15 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #15718 from chancancode/regression_from_15694 | Godfrey Chan | 2014-07-16 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed a regression introduced in 84cf156 | Godfrey Chan | 2014-06-14 | 1 | -1/+5 |
* | | | | | | | we intend to keep the `capture` helper for Active Record tests. | Yves Senn | 2014-07-16 | 1 | -18/+12 |
* | | | | | | | Active Record tests still depend on `capture`. Let's keep it for now. | Yves Senn | 2014-07-16 | 2 | -19/+23 |
* | | | | | | | use foreign key DSL in our tests. | Yves Senn | 2014-07-16 | 2 | -5/+4 |
* | | | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-key | Yves Senn | 2014-07-16 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | AttributeSet#include? -> AttributeSet#key? | Sean Griffin | 2014-07-11 | 1 | -5/+5 |
* | | | | | | | | Merge pull request #16180 from rafaelfranca/rm-dirty | Rafael Mendonça França | 2014-07-15 | 1 | -2/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`. | Rafael Mendonça França | 2014-07-15 | 1 | -2/+14 |
* | | | | | | | | | Keep quietly and capture undeprecated on your suite | Rafael Mendonça França | 2014-07-15 | 2 | -0/+29 |
* | | | | | | | | | Document the change in `nil` handling for serialized attributes | Godfrey Chan | 2014-07-15 | 1 | -9/+12 |
* | | | | | | | | | Fixed SQL syntax for postgresql | Godfrey Chan | 2014-07-15 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #16162 from chancancode/fix_json_coder | Godfrey Chan | 2014-07-15 | 1 | -0/+18 |
* | | | | | | | | | Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"" | Godfrey Chan | 2014-07-15 | 1 | -1/+15 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #15266 from dv/use_counter_cache_for_empty_call | Godfrey Chan | 2014-07-15 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | If a counter_cache exists, use it for #empty? | David Verhasselt | 2014-06-10 | 1 | -0/+7 |
* | | | | | | | | Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-clas... | Aaron Patterson | 2014-07-14 | 1 | -34/+30 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Begin refactoring ThroughReflection | eileencodes | 2014-07-08 | 1 | -34/+30 |
* | | | | | | | | Address ORA-00972: identifier is too long when tested with Oracle | Yasuo Honda | 2014-07-14 | 3 | -4/+5 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #16127 from Envek/fix_16111 | Matthew Draper | 2014-07-14 | 1 | -0/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Dump PostgreSQL primary key with custom function as a default. | Andrey Novikov | 2014-07-11 | 1 | -0/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-12 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-11 | 1 | -0/+7 |
* | | | | | | | Include fixtures to prevent foreign key violation. | Zuhao Wan | 2014-07-09 | 1 | -0/+2 |
* | | | | | | | Merge pull request #16093 from zuhao/refactor_activerecord_nested_through_ass... | Rafael Mendonça França | 2014-07-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Warm up cache to prevent assertion failure. | Zuhao Wan | 2014-07-08 | 1 | -0/+1 |
* | | | | | | | Merge pull request #16072 from sgrif/sg-xml-quoting | Rafael Mendonça França | 2014-07-08 | 1 | -1/+14 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Don't rely on the sql type to quote XML columns in PG | Sean Griffin | 2014-07-06 | 1 | -1/+14 |
| |/ / / / / | |||||
* / / / / / | Remove the `text?` predicate from the type objects | Sean Griffin | 2014-07-06 | 14 | -18/+0 |
|/ / / / / | |||||
* | | | | | Change back occurrences of SQLite(3) to sqlite3 when referring to the | Zachary Scott | 2014-07-06 | 1 | -5/+6 |
* | | | | | Merge pull request #16057 from akshay-vishnoi/doc_change | Zachary Scott | 2014-07-06 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | [ci skip] /sqlite/i --> SQLite | Akshay Vishnoi | 2014-07-06 | 1 | -2/+2 |
* | | | | | | active_record: Type cast booleans and durations for string columns. | Dylan Thacker-Smith | 2014-07-06 | 2 | -3/+34 |