aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update the levenshtein distance method in guides.Juanito Fatas2014-06-281-21/+29
|
* Merge pull request #15951 from pcreux/fix-mysql-test-fkGodfrey Chan2014-06-271-1/+4
|\ | | | | MySQL doesn't work with foreign keys
| * MySQL doesn't work with foreign keysPhilippe Creux2014-06-271-1/+4
|/ | | | | | This was previously fixed in e84799d but broken in 3f596f8. This commit reintroduced the conditional that prevents the foreign keys from being added to MySQL databases.
* Merge pull request #15949 from pcreux/fix-add-foreign-key-in-testGodfrey Chan2014-06-271-1/+1
|\ | | | | Fix test with `add_foreign_key` DSL
| * Fix test with add_foreign_key DSL in 9d21ef9Philippe Creux2014-06-271-1/+1
|/
* Merge pull request #15934 from seuros/renameRafael Mendonça França2014-06-273-3/+17
|\ | | | | | | rename primary key sequence only if it exists
| * rename sequence only if it existsAbdelkader Boudih2014-06-273-3/+17
| |
* | Merge pull request #15943 from wagenet/cache-instrumentationRafael Mendonça França2014-06-272-11/+17
|\ \ | | | | | | | | | Always instrument ActiveSupport::Cache
| * | Always instrument ActiveSupport::CachePeter Wagenet2014-06-271-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | The current approach is broken because it uses a thread local value which means on multi-threaded environments it has to be turned on per thread. Secondly, ActiveSupport::Notifications does not instrument items when there are not subscribers so this flag is unnecessary.
* | | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-276-5/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver]
| * | | Improvements per code review.Rafael Chacón2014-06-274-5/+60
| | | | | | | | | | | | | | | | | | | | | | | | * General style fixes. * Add changes to configuration guide. * Add missing tests.
| * | | Add always_permitted_parameters as an option.Rafael Chacón2014-06-263-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This commit adds back the always_permitted_parameters configuration option to strong paramaters. * The initial pull requests where this feature was added are the following: - https://github.com/rails/rails/pull/12682 - https://github.com/rails/strong_parameters/pull/174
* | | | Merge pull request #15946 from jamesprior/patch-1Rafael Mendonça França2014-06-271-1/+2
|\ \ \ \ | | | | | | | | | | Update documentation for run_callbacks
| * | | | Update documentation for run_callbacksjamesprior2014-06-271-1/+2
| | | | | | | | | | | | | | | In some cases run_callbacks will return nil. I'm attempting to update the documentation for the method to clarify.
* | | | | Do not change the global state of the test suiteRafael Mendonça França2014-06-272-18/+2
|/ / / /
* | | | Improve tests to use add_foreign_key DSLRafael Mendonça França2014-06-271-18/+11
| | | |
* | | | MySQL doesn't works with foreign keyRafael Mendonça França2014-06-271-3/+2
| | | |
* | | | We are talking about the libraries, not the constantsSean Griffin2014-06-271-3/+3
| | | |
* | | | Note that `_will_change!` is no longer needed for AR instancesSean Griffin2014-06-271-3/+5
| |_|/ |/| | | | | | | | | | | | | | | | | Leave the note for `ActiveModel`, since it can't yet detect mutations (hopefully we can change this in time for 4.2). However, we now detect mutations on all supported types in `ActiveRecord`, so we can note that `_will_change!` is no longer needed there.
* | | Talk about config.assts.version move tooRafael Mendonça França2014-06-271-1/+1
| | | | | | | | | | | | Closes #15942
* | | Merge pull request #12450 from iantropov/masterRafael Mendonça França2014-06-275-5/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug, when ':dependent => :destroy' violates foreign key constraints Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/has_one.rb
| * | | Fix bug, when ':dependent => :destroy' option violates foreign key ↵Ivan Antropov2013-10-265-9/+61
| | | | | | | | | | | | | | | | constraints, issue #12380
* | | | Merge pull request #15788 from sgrif/sg-mutable-stringsRafael Mendonça França2014-06-275-13/+77
|\ \ \ \ | | | | | | | | | | | | | | | Detect in-place modifications on Strings
| * | | | Detect in-place modifications on StringsSean Griffin2014-06-174-13/+55
| | | | |
* | | | | Merge pull request #8639 from bogdan/valid-with-bangRafael Mendonça França2014-06-273-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add AR::Base#valid! method
| * | | | | Add AR::Base#validate! methodBogdan Gusiev2014-06-232-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acts same as valid? but raises AR::RecordInvalid exception if validation fails
* | | | | | Merge pull request #15940 from DNNX/databases-rake-refactoringRafael Mendonça França2014-06-274-31/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | databases.rake refactoring
| * | | | | | Use AR::SchemaMigration.table_exists? call instead of longish AR::Base...etc,etcViktar Basharymau2014-06-271-1/+1
| | | | | | |
| * | | | | | Extract AR::SchemaMigration.normalized_versions methodViktar Basharymau2014-06-272-2/+5
| | | | | | |
| * | | | | | Add a test for db:migrate:status to check missing file scenarioViktar Basharymau2014-06-271-0/+15
| | | | | | |
| * | | | | | db:migrate:status refactoring: Rewrite hand-crafted SQL query with ↵Viktar Basharymau2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#pluck
| * | | | | | Use Array#flat_map and Array#grep in db:migrate:status taskViktar Basharymau2014-06-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows the code to be more declarative and elegant.
| * | | | | | Add explaining variables to db:migrate:statusViktar Basharymau2014-06-271-2/+2
| | | | | | |
| * | | | | | Replace String index juggling with Pathname goodness in db:fixtures:loadViktar Basharymau2014-06-271-1/+1
| | | | | | |
| * | | | | | db:fixtures:load refactoring: remove unnecessary loopViktar Basharymau2014-06-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::FixtureSet.create_fixtures` can accept an array of fixture_files.
| * | | | | | Extract `fixture_files` variable in fixtures:load rake taskViktar Basharymau2014-06-271-1/+7
| | | | | | |
| * | | | | | Replace a bit of cryptic code in fixtures:load rake task with plain stupid RubyViktar Basharymau2014-06-271-1/+5
| | | | | | |
| * | | | | | Get rid of duplication in db:fixtures:{identify,load}Viktar Basharymau2014-06-272-12/+7
| | | | | | |
| * | | | | | db:fixtures:{identify,load} tasks respect AR::Tasks::DatabaseTasks.rootViktar Basharymau2014-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, if `ENV['FIXTURES_PATH']` was set, then `Rails.root` was used, otherwise the app used `ActiveRecord::Tasks::DatabaseTasks.root`. Now it is consistent.
| * | | | | | Simplify complex code in databases.rakeViktar Basharymau2014-06-271-2/+2
| | | | | | |
* | | | | | | Merge pull request #15938 from sgrif/sg-stop-instance-execingRafael Mendonça França2014-06-273-17/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Stop using instance exec for type decorators
| * | | | | | Stop using instance exec for type decoratorsSean Griffin & Sean Doyle2014-06-273-17/+38
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are moving this behavior out to an object that we would like to keep separated from `ActiveRecord::Base`, which means not passing the class object to it. As such, we need to stop using `instance_exec`, and instead close over the subclass on global type decorators that are applied in `Base`.
* | | | | | Follow-up to #15215 [ci skip]Robin Dupret2014-06-273-10/+12
| | | | | |
* | | | | | credit Matthew Higgins for the integration of foreign keys. [ci skip]Yves Senn2014-06-271-0/+3
| | | | | |
* | | | | | Tiny follow-up to 1a69112Robin Dupret2014-06-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap list items to 80 chars and avoid relying on NOTE inside an item since they are meant to be parsed in paragraphs, not lists. [ci skip]
* | | | | | Merge pull request #14247 from robin850/inflections-with-uncountablesRafael Mendonça França2014-06-263-5/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the apply_inflections method case-sensitive
| * | | | | | Make the apply_inflections method case-sensitiveRobin Dupret2014-06-263-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since d3071db1, the apply_inflections method check if the downcased version of a string is contained inside the "whitelist" of uncountable words. However, if the word is composed of capital letters, it won't be matched in the list while it should. We can't simply revert to the previous behavior as there is a performance concern (benchmarked over /usr/share/dict/words): Before d3071db1 135.610000 0.290000 135.900000 (137.807081) Since d3071db1 22.170000 0.020000 22.190000 ( 22.530005) With the patch 22.060000 0.020000 22.080000 ( 22.125771) Benchmarked with http://git.io/aFnWig This way, the solution is to put the down-case version of words inside the @uncountables array.
* | | | | | | Change method visibilityRafael Mendonça França2014-06-261-2/+2
| | | | | | |
* | | | | | | Add nodoc to internal class [ci skip]Rafael Mendonça França2014-06-261-1/+1
| | | | | | |
* | | | | | | Merge pull request #15606 from senny/ar/foreign_key_supportRafael Mendonça França2014-06-2620-70/+739
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | Basic support for adding and removing foreign keys