aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | push add to transaction logic down to the instanceAaron Patterson2015-02-013-6/+10
| | | | | | | | | | the transaction object shouldn't know so much about active record objects, so let's push the conditionals in to the instance.
* | remove conditional that is always trueAaron Patterson2015-02-011-3/+2
| |
* | stop making calls to add_recordAaron Patterson2015-02-011-1/+1
| |
* | Merge pull request #18770 from palkan/docs-hasone-dependentAbdelkader Boudih2015-02-011-0/+4
|\ \ | | | | | | Add note about has_one :through and :dependent
| * | [ci skip] add note about has_one :through and :dependentpalkan2015-02-011-0/+4
| | |
* | | Merge pull request #18756 from ajgrover/activejob_testsMatthew Draper2015-02-011-1/+1
|\ \ \ | |_|/ |/| | Update queue_classic gem to use latest
| * | Update queue_classic gem to use latestAlex Grover2015-01-311-1/+1
| | | | | | | | | | | | | | | | | | Remove '<3.0.0' requirement for queue_classic gem. This fixes the issue that the gem was attempting to parse the queue name as a URI, causing all of the tests to fail.
* | | Merge pull request #18721 from sj26/pre-discard-flashAaron Patterson2015-02-014-28/+51
|\ \ \ | | | | | | | | Pre-discard flash messages
| * | | Migrate old flash behaviourSamuel Cochran2015-01-302-6/+13
| | | |
| * | | Discard from flash before persisting in sessionSamuel Cochran2015-01-292-24/+26
| | | |
| * | | Fix flash remaining after last flash deletedSamuel Cochran2015-01-292-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a controller functional test after the last flash is deleted it still persists the flash because to_session_value is nil. We should delete it from the session when the serialized version is nil, same as the flash middleware.
* | | | Merge pull request #18769 from gsamokovarov/exception-wrapper-windows-pathsAndrew White2015-02-012-2/+25
|\ \ \ \ | | | | | | | | | | Show proper traces on Windows for the error pages
| * | | | Show proper traces on Windows for the error pagesGenadi Samokovarov2015-02-012-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an issue brought up by @daniel-rikowski in rails/web-console#91. Citing his PR proposal here: > Prior to this, backtrace lines were simply split by a single colon. > > Unfortunately that is also the drive letter delimiter in Windows paths > which resulted in a lot of empty source fragments of "C:0". ("C" from > the drive letter and 0 from "/path/to/rails/file.rb:16".to_i) > > Now the trace line is split by the first colon followed by some digits, > which works for both Windows and Unix path styles. Now, the PR was sent against web-console, because of the templates copy issue we used to had. Instead of bothering the contributor to reopen the issue against upstream Rails itself, I will make sure he gets the credit by putting his name in [rails-contributors/hard_coded_authors.rb][]. [rails-contributors/hard_coded_authors.rb]: (https://github.com/fxn/rails-contributors/blob/master/app/models/names_manager/hard_coded_authors.rb).
* | | | | Merge branch 'master' into mdluo-masterAaron Patterson2015-02-0129-45/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Move required error message and changelog to Active Record Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846 Use Module#include instead of send :include, since now is a public method [ci skip] :scissors: warning from controller renderer test Conflicts: activerecord/CHANGELOG.md
| * | | | | Move required error message and changelog to Active RecordCarlos Antonio da Silva2015-02-014-7/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | The new association error belongs to Active Record, not Active Model. See #18700 for reference.
| * | | | Merge pull request #18759 from yuki24/remove-warningYves Senn2015-02-011-3/+3
| |\ \ \ \ | | |/ / / | |/| | | :scissors: warning from controller renderer test
| | * | | :scissors: warning from controller renderer testYuki Nishijima2015-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | rails/actionpack/test/controller/renderer_test.rb:89: warning: possible reference to past scope - defaults
| * | | | Merge pull request #18767 from robertomiranda/ruby-2.2Sean Griffin2015-01-3122-32/+32
| |\ \ \ \ | | | | | | | | | | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
| | * | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846robertomiranda2015-01-3122-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769
| * | | | | Merge pull request #18763 from robertomiranda/ruby-2.2Sean Griffin2015-01-312-3/+3
| |\| | | | | | | | | | | | | | | | Use Module#include instead of send :include, since Module#include is a public method [ci skip]
| | * | | | Use Module#include instead of send :include, since now is a public method ↵robertomiranda2015-01-312-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] ref https://bugs.ruby-lang.org/issues/8846
* | | | | Merge pull request #1 from mdluo/pr/18316Mingdong Luo2015-01-313-1/+18
|\ \ \ \ \ | |/ / / / |/| | | | Fix n+1 query problem when eager loading nil associations (fixes #18312)
| * | | | Merge branch 'master' into pr/18316Mingdong Luo2015-01-31571-4788/+7210
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
* | | | | Attribute assignment and type casting has nothing to do with columnsSean Griffin2015-01-3115-113/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's finally finished!!!!!!! The reason the Attributes API was kept private in 4.2 was due to some publicly visible implementation details. It was previously implemented by overloading `columns` and `columns_hash`, to make them return column objects which were modified with the attribute information. This meant that those methods LIED! We didn't change the database schema. We changed the attribute information on the class. That is wrong! It should be the other way around, where schema loading just calls the attributes API for you. And now it does! Yes, this means that there is nothing that happens in automatic schema loading that you couldn't manually do yourself. (There's still some funky cases where we hit the connection adapter that I need to handle, before we can turn off automatic schema detection entirely.) There were a few weird test failures caused by this that had to be fixed. The main source came from the fact that the attribute methods are now defined in terms of `attribute_names`, which has a clause like `return [] unless table_exists?`. I don't *think* this is an issue, since the only place this caused failures were in a fake adapter which didn't override `table_exists?`. Additionally, there were a few cases where tests were failing because a migration was run, but the model was not reloaded. I'm not sure why these started failing from this change, I might need to clear an additional cache in `reload_schema_from_cache`. Again, since this is not normal usage, and it's expected that `reset_column_information` will be called after the table is modified, I don't think it's a problem. Still, test failures that were unrelated to the change are worrying, and I need to dig into them further. Finally, I spent a lot of time debugging issues with the mutex used in `define_attribute_methods`. I think we can just remove that method entirely, and define the attribute methods *manually* in the call to `define_attribute`, which would simplify the code *tremendously*. Ok. now to make this damn thing public, and work on moving it up to Active Model.
* | | | | Merge pull request #18760 from hjoo/fix_fixturesAaron Patterson2015-01-311-1/+2
|\ \ \ \ \ | | | | | | | | | | | | changed deleted_tables list to set
| * | | | | changed deleted_tables list to setHyonjee Joo2015-01-311-1/+2
|/ / / / /
* | | | | Merge pull request #18512 from vipulnsward/18492-fixtures-with-stiAaron Patterson2015-01-317-12/+46
|\ \ \ \ \ | |_|/ / / |/| | | | Fix STI for fixtures from multi-files
| * | | | Fixes #18492Vipul A M2015-01-147-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add check for not deleting previously created fixtures, to overcome sti fixtures from multiple files - Added fixtures and fixtures test to verify the same - Fixed wrong fixtures duplicating data insertion in same table
* | | | | Remove `AttributeSet#initialized_keys`Sean Griffin2015-01-312-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method doesn't need to be lazy, as it is never called from reads. The only time it is called are in write cases, where we're about to loop through the results of it, and build the attribute objects anyway. So we don't gain anything by dodging the instantiation here. This is the only method that coupled `AttributeSet` to `LazyAttributeHash`, so removing it puts us back in a place where we can use a normal hash instead.
* | | | | Merge pull request #18700 from nygrenh/better-required-messageAaron Patterson2015-01-314-3/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | | Provide a better error message on :required association
| * | | | Provide a better error message on :required associationHenrik Nygren2015-01-284-3/+29
| | | | | | | | | | | | | | | | | | | | Fixes #18696.
* | | | | Merge pull request #18753 from andreynering/guide-single-table-inheritanceRobin Dupret2015-01-312-0/+68
|\ \ \ \ \ | | | | | | | | | | | | Add Single Table Inheritance to guides [ci skip]
| * | | | | Add Single Table Inheritance to guides [ci skip]Andrey Nering2015-01-312-0/+68
| | | | | |
* | | | | | Merge pull request #18540 from andreynering/guides-custom-form-builderRobin Dupret2015-01-311-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improving 'Customizing Form Builder' section with example [ci skip]
| * | | | | | Improving 'Customizing Form Builder' section with example [ci skip]Andrey Nering2015-01-161-1/+8
| | | | | | |
* | | | | | | Merge pull request #18752 from vipulnsward/kwargs-avArthur Nogueira Neves2015-01-313-29/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed test for deprecation warning in actionview for kwargs
| * | | | | | | Fixed test for deprecation warning in actionview, renaming from ↵Vipul A M2015-01-313-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/baf14ae513337cb185acf865e93dfc48f3aabf6a
* | | | | | | | Merge pull request #18749 from JuanitoFatas/doc/fix-type-in-deprecationAndrew White2015-01-311-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix a typo in deprecation warning. #process takes method instead of http_method.
| * | | | | | | Fix a typo in deprecation warning. #process takes method instead of http_method.Juanito Fatas2015-01-311-1/+1
| | | | | | | |
* | | | | | | | fix kindlerb version [ci skip]Xavier Noria2015-01-311-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we know generation works with this version, it does not mean it does not work with the last releases (should be tested).
* | | | | | | Merge pull request #18748 from JuanitoFatas/doc/process-formatAbdelkader Boudih2015-01-311-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Document format parameter of process method in AC test_case.
| * | | | | | | [ci skip] Document format parameter of process method in AC test_case.Juanito Fatas2015-01-311-0/+1
|/ / / / / / /
* / / / / / / unify CHANGELOG format. [ci skip]Yves Senn2015-01-314-39/+42
|/ / / / / /
* | | | | | Fixed a few things from ee9e4c3Godfrey Chan2015-01-305-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly cosmetics, except that `isolate_namespace` should be applied to the last module in the chain.
* | | | | | Merge pull request #13601 from robinboening/allow_dashes_in_gem_namesGodfrey Chan2015-01-3021-67/+194
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Allow hyphenated names for `rails plugin new` generator
| * | | | | | Allow hyphenated names for `rails plugin new` generator.Robin Böning2015-01-3021-67/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was not possible to create a new gem with a hyphenated name via the `rails plugin new` generator. The naming guide of rubygems clearly says dashes should be used for gems that extend other gems. http://guides.rubygems.org/name-your-gem/
* | | | | | | Allow keyword arguments to work with ActiveJobSean Griffin2015-01-304-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, the HashWithIndifferent access approach is insufficient for our needs. It's perfectly reasonable to want to use keyword arguments with Active Job, which we will see as a symbol keyed hash. For Ruby to convert this back to keyword arguments, it must deserialize to a symbol keyed hash. There are two primary changes to the serialization behavior. We first treat a HWIA separately, and mark it as such so we can convert it back into a HWIA during deserialization. For normal hashes, we keep a list of all symbol keys, and convert them back to symbol keys after deserialization. Fixes #18741.
* | | | | | | Remove most type related predicates from `Column`Sean Griffin2015-01-3026-101/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remaining are `limit`, `precision`, `scale`, and `type` (the symbol version). These will remain on the column, since they mirror the options to the `column` method in the schema definition DSL
* | | | | | | Remove most uses of `Column#cast_type`Sean Griffin2015-01-306-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal is to remove the type object from the column, and remove columns from the type casting process entirely. The primary motivation for this is clarity. The connection adapter does not have sufficient type information, since the type we want to work with might have been overriden at the class level. By taking this object from the column, it is easy to mistakenly think that the column object which exists on the connection adapter is sufficient. It isn't. A concrete example of this is `serialize`. In 4.2 and earlier, `where` worked in a very inconsistent and confusing manner. If you passed a single value to `where`, it would serialize it before querying, and do the right thing. However, passing it as part of an array, hash, or range would cause it to not work. This is because it would stop using prepared statements, so the type casting would come from arel. Arel would have no choice but to get the column from the connection adapter, which would treat it as any other string column, and query for the wrong value. There are a handful of cases where using the column object to find the cast type is appropriate. These are cases where there is not actually a class involved, such as the migration DSL, or fixtures. For all other cases, the API should be designed as such that the type is provided before we get to the connection adapter. (For an example of this, see the work done to decorate the arel table object with a type caster, or the introduction of `QueryAttribute` to `Relation`). There are times that it is appropriate to use information from the column to change behavior in the connection adapter. These cases are when the primitive used to represent that type before it goes to the database does not sufficiently express what needs to happen. An example of this that affects every adapter is binary vs varchar, where the primitive used for both is a string. In this case it is appropriate to look at the column object to determine which quoting method to use, as this is something schema dependent. An example of something which would not be appropriate is to look at the type and see that it is a datetime, and performing string parsing when given a string instead of a date. This is the type of logic that should live entirely on the type. The value which comes out of the type should be a sufficiently generic primitive that the adapter can be expected to know how to work with it. The one place that is still using the column for type information which should not be necessary is the connection adapter type caster which is sometimes given to the arel table when we can't find the associated table. This will hopefully go away in the near future.
* | | | | | | Fix a state leak in `autosave_association_test`Sean Griffin2015-01-301-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test added in 85465ed3e6c582d25f0c8fafe21f7a2c182c2f67 was passing when the file was run on its own, but failing when the entire suite was run since this test modifies the class and doesn't clean up.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:58:49 +0000