aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16220 from pcreux/postgresql-jsonb-supportYves Senn2014-07-256-9/+64
|\
| * Add support for Postgresql JSONBPhilippe Creux2014-07-246-9/+64
|/
* tests, run adapter specific rake tests only for the right adapter.Yves Senn2014-07-243-0/+6
* build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6Yves Senn2014-07-241-2/+2
* fix, mysql `db:purge` respects `Rails.env`.Yves Senn2014-07-242-1/+5
* clenaup, unify CHANGELOG format. [ci skip]Yves Senn2014-07-241-5/+7
* Merge pull request #16280 from a3gis/masterMatthew Draper2014-07-241-2/+2
|\
| * Fix documentation typo in ConnectionSpecification::Resolve.speca3gis2014-07-241-1/+1
| * Fixes #16265a3gis2014-07-241-1/+1
* | pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`.Yves Senn2014-07-242-1/+16
|/
* Merge pull request #16231 from Envek/type_in_referencesYves Senn2014-07-226-5/+56
|\
| * Allow to specify a type for foreign key column in migrationsAndrey Novikov2014-07-226-3/+46
|/
* Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_ass...Yves Senn2014-07-221-1/+1
|\
| * Make sure assertion passes for postgresql.Zuhao Wan2014-07-221-1/+1
* | Remove redundant that already happened in teardown.Zuhao Wan2014-07-221-1/+0
|/
* build fix, remove not null constraint.Yves Senn2014-07-221-1/+1
* Merge pull request #16250 from zuhao/refactor_activerecord_migration_testYves Senn2014-07-221-1/+1
|\
| * Remove length limit that results failure in other tests.Zuhao Wan2014-07-221-1/+1
* | Remove the side-effects of validates_presence_of.Zuhao Wan2014-07-221-2/+3
|/
* Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
|\
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
* | Merge pull request #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \
| * | Fixed typo in commentSteve2014-07-191-1/+1
* | | create_join_table uses same logic as HABTM reflectionsStefan Kanev2014-07-185-2/+44
* | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \
| * | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
* | | | Disable some tests on SQLiteRafael Mendonça França2014-07-171-77/+77
* | | | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2
* | | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_castRafael Mendonça França2014-07-173-9/+38
|\ \ \ \
| * | | | Fix decimal_test module and add new test for object responding to to_dMariano Valles2014-07-162-7/+15
| * | | | Fix case statement to use ::Numeric and ::StringMariano Valles2014-07-163-18/+25
| * | | | Change class evaluation for Rationals in cast_valueMariano Valles2014-07-162-5/+7
| * | | | Fix rational to decimal on type_cast_from_userMariano Valles2014-07-162-1/+13
* | | | | Remove need for macro instance vareileencodes2014-07-171-11/+14
* | | | | Remove unused 1:1 association :remote optionChris Griego2014-07-161-1/+1
* | | | | Merge pull request #16196 from yahonda/mysql_restrict_testMatthew Draper2014-07-172-8/+6
|\ \ \ \ \
| * | | | | Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"Yasuo Honda2014-07-172-8/+6
* | | | | | Merge pull request #15944 from seuros/uuidRafael Mendonça França2014-07-163-1/+51
|\ \ \ \ \ \
| * | | | | | Treat invalid uuid as nilAbdelkader Boudih2014-07-143-1/+51
* | | | | | | Merge pull request #16183 from goddamnhippie/fix-psych-warningRafael Mendonça França2014-07-162-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Move #encode_with to RelationGustavo Beathyate2014-07-152-4/+5
| * | | | | | | Implement required #encode_withGustavo Beathyate2014-07-152-0/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #15718 from chancancode/regression_from_15694Godfrey Chan2014-07-162-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Fixed a regression introduced in 84cf156Godfrey Chan2014-06-142-1/+10
* | | | | | | | nodoc enum hooks [ci skip]Rafael Mendonça França2014-07-161-2/+2
* | | | | | | | we intend to keep the `capture` helper for Active Record tests.Yves Senn2014-07-161-18/+12
* | | | | | | | Active Record tests still depend on `capture`. Let's keep it for now.Yves Senn2014-07-162-19/+23
* | | | | | | | use foreign key DSL in our tests.Yves Senn2014-07-162-5/+4
* | | | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-keyYves Senn2014-07-163-10/+10
|\ \ \ \ \ \ \ \