| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Fix CVE-2014-3482.
|
|\
| |
| |
| |
| | |
Conflicts:
actionpack/CHANGELOG.md
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
actionpack/CHANGELOG.md
|
| | |
|
|/
|
| |
session_id doesn't need to be a text column, just string (VARCHAR)
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
This reverts commit ccd11d58910059f07b28cc518dbdad42cbc8ea0c, reversing
changes made to 54c05acdba138f3a7a3d44dfc922b0fe4e4cf554.
Reason: This caused a regression when the associated record is created
in a before_create callback. See
https://github.com/rails/rails/pull/12413#issuecomment-25848163
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7ed5bdc834479c39e3b0ad5a38bcffe27983c10d, reversing
changes made to 31c79e291f42b1d862df06c552fe002864aae705.
Reason: this caused a regression when the associated record is creted in
a before_create callback.
See https://github.com/rails/rails/pull/12413#issuecomment-25848163
|
| |
|
|
|
|
| |
Add inverse of add target
|
| |
|
|\
| |
| | |
Fix STI scopes using benolee's suggestion. Fixes #11939
|
| | |
|
| |
| |
| |
| | |
[fixes #10371]
|
| |
| |
| |
| |
| | |
inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
found on the db.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/models/company.rb
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes table.joins(:relation).last(N) breaking on sqlite
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/finder_test.rb
|
|/ |
|
| |
|
|
|
|
| |
quote_value is called on the object not the class
|
|
|
|
|
|
|
|
|
|
| |
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/locking/optimistic.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.
I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.
This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.
I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/locking/optimistic.rb
|
|
|
|
| |
This is reworking of rails/rails/pull/7380 made for rails 3.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
jetthoughts/11450_do_not_resave_destroyed_association
Do not re-save destroyed association on saving parent object
Conflicts:
activerecord/lib/active_record/autosave_association.rb
|
| |
|
|
|
|
|
|
|
| |
when result_error_field is not defined on result raise the original
exception.
Fixes #11260
|
| |
|
|
|
|
| |
The connection url parssing don't accept the socket option
|
|\
| |
| | |
Add test case for issue #10393 and fix warning message
|
| |
| |
| |
| |
| |
| | |
This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise.
Test case written by tkhr <takehiro0740@gmail.com>.
|
|/ |
|
|\
| |
| |
| |
| | |
JonRowe/add_test_to_assert_association_doesnt_overwrite
Add a test to assert autosaving associations doesn't overwrite id accessor methods
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | | |
Fix a bug in ActiveRecord::Store accessors
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader""
This reverts commit 5009b078875e596a2fba7827336f7548aa6e35ac.
Also updated the CHANGELOG and adjusted the test-case to match the one on master.
|