| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
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>.
|
| |
|
|\
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader"
This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing
changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07.
I missed to check the target branch and wrongly merged it into 3-2-stable directly.
|
|\ \
| | |
| | |
| | |
| | | |
armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader
Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| | |
regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:
activerecord/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| | |
Fix the `:primary_key` option for `has_many` associations.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/associations/has_many_association.rb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a backport of #10417
fixes bug introduced by #3329
These are the conditions necessary to reproduce the bug:
- For an association, autosave => true.
- An association record is being destroyed
- A new association record is being created.
- There is a unique index one of the association's fields.
- The record being created has the same value as the record being
destroyed on the indexed field.
Before, the deletion of records was postponed until after all
insertions/saves. Therefore the new record with the identical value in
the indexed field caused a non-unique value error to be thrown at the
database
level.
With this fix, the deletions happen first, before the insertions/saves.
Therefore the record with the duplicate value is gone from the database
before the new record is created, thereby avoiding the non-uniuqe value
error.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT"
The combination of a :uniq => true association and the #distinct call
in #construct_limited_ids_condition combine to create invalid SQL, because
we're explicitly selecting DISTINCT, and also sending #distinct on to AREL,
via the relation#distinct_value.
Where #6792 was the forever fix, this is the minimal fix. Instead of
properly indicating the distinctness of the query through #uniq_value alone,
we use a literal select statement and set #uniq_value to always be falsey
|
| |
| |
| |
| | |
[ci skip]
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
backport runner fixes to 3-2-stable
Conflicts:
railties/CHANGELOG.md
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a runner hook to Rails::Application and Rails::Engine that requires
ActiveRecord::Base to avoid circular constant loading when using observers.
This commit backports cc7dd66, c0ba0f0 and 8d01c61.
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is a backport of #10164, already merged into
master. The issue is described in lengthy detail
in issues #3002 and #5494.
|
| | |
| | |
| | |
| | | |
Now with a non-broken test.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
Reason: This caused a regression since it changed the behavior in a
stable release.
Fixes #9777
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Confirm a record has not already been destroyed before decrementing counter cache
Conflicts:
activerecord/CHANGELOG.md
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/associations/builder/belongs_to.rb
|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
activerecord/test/cases/schema_dumper_test.rb
|
|\ \
| | |
| | | |
Fixes Issue #7490: Chained scopes will preload properly
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is causing a regression since the Active Record Railtie is trying to
connect to the development database in the application boot.
See https://github.com/rails/rails/pull/6197#issuecomment-15199273
|
| | | |
|
| | |
| | |
| | |
| | | |
Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.
|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/CHANGELOG.md
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch resets the postgres search path in the structure.sql after
the structure is dumped in order to find schema_migrations table when
multiples schemas are used.
Fixes #945
|
| | |
| | |
| | |
| | | |
Set "March 18, 2013" as the release date for 3.2.13
|
| | | |
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 3-2-13:
bumping to 3.2.13
fix protocol checking in sanitization [CVE-2013-1857]
JDOM XXE Protection [CVE-2013-1856]
fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
stop calling to_sym when building arel nodes [CVE-2013-1854]
Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets
bumping to rc2
Revert "Merge pull request #8209 from senny/backport_8176"
Freeze columns only once per Result
Preparing for 3.2.13.rc1 release
Update CHANGELOGs for 3.2.13 release.
Conflicts:
actionmailer/CHANGELOG.md
actionpack/CHANGELOG.md
activemodel/CHANGELOG.md
activeresource/CHANGELOG.md
activesupport/CHANGELOG.md
railties/CHANGELOG.md
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
activerecord/test/cases/calculations_test.rb
|
| | | |
|
|\ \ \
| | | |
| | | | |
Fix issue #7526. Reload the association target if it's stale.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* This has been fixed at master via `365b8b6`, but not at 3-2-stable branch.
* @stale_state should be nil when a model isn't saved. via `0f3901e`.
* set @stale_state to nil when reset the target.
|
|/ / / |
|
| | | |
|
|/ /
| |
| |
| | |
db:fixtures:load.
|
| |
| |
| |
| | |
Since we released it, it should go in the CHANGELOG.
|
| | |
|
| | |
|
| |
| |
| |
| | |
scope.
|