| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |/ / / |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* master-sec:
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]
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
Remove ancient TODOs [ci skip]
|
| | |/ /
| |/| | |
|
|/ / /
| | |
| | |
| | |
| | | |
These tests should be in inheritance_test.rb since its testing a
feature which is implemented in inheritance.rb
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Closes #8079.
I had to rework some of the tests because the mock allowed any arguments
for `connection.exeucte`. I think this is very dangerous as there could
anything be executed without the tests noticing it.
|
| | |
| | |
| | |
| | |
| | |
| | | |
"utf8mb4"
Please, see rationale in the included CHANGELOG patch.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
PR #5210 added a Friendship model to illustrate a bug, but in doing so
created a confusing structure because both belongs_to declarations in
Friendship referred to the same side of the join. The new structure
maintains the integrity of the bug test while changing the follower
relationship to be more useful for other testing.
|
| | |
| | |
| | |
| | |
| | | |
the primary key on an association will make sure that the corresponding
counter on the association is changed properly. Fixes #9722.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
senny/9712_option_to_turn_references_deprecation_off
make it possible to disable implicit join references.
|
| | | |
| | | |
| | | |
| | | | |
Closes #9712.
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reimplements the behaviour of Rails 3, as I couldn't see why we
shouldn't cache the object, and @alindeman had a good use case for
caching it:
https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312
|
|\ \ \
| | | |
| | | | |
rename `Relation#uniq` to `Relation#distinct`
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We moved more and more away from passing options to finder / calculation
methods. The `:distinct` option in `#count` was one of the remaining places.
Since we can now combine `Relation#distinct` with `Relation#count` the option
is no longer necessary and can be deprecated.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our
Relation API is close to SQL terms I renamed `#uniq` to `#distinct`.
There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue
to work. I also updated the documentation to promote the use of `#distinct`.
|
|\ \ \ \
| |/ / /
|/| | | |
Cast number to string in Postgres
|
| | | |
| | | |
| | | |
| | | | |
fixes #9170
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Closes #9724.
Raise an `ArgumentError` when the name of the counter does not
match an association name.
|
| | | | |
|
| | | | |
|
| |_|/
|/| | |
|
|/ / |
|
| |
| |
| |
| | |
To make quote escape binary data correctly it needs the column passed in.
|
| |
| |
| |
| |
| |
| | |
assertion for
https://github.com/rails/rails/blob/ad624345e54bd20802de67b2b5c9ef29ecf5
d5f4/activerecord/lib/active_record/inheritance.rb#L32
|
| | |
|
| |
| |
| |
| | |
Take the opportunity to showcase where.not.
|
| |
| |
| |
| |
| | |
This is a follow up to #5321 and follows the general direction in
AR to make things lazy evaluated.
|
| |
| |
| |
| |
| | |
This allows end-users to have a `connection` method on their models
without clashing with ActiveRecord internals.
|
| |
| |
| |
| |
| | |
During insertion of "# This migration comes from ... " comment at the beginning of
a migration, presence of magic comment was not considered.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix ActiveRecord `subclass_from_attrs` when eager_load is false.
Conflicts:
activerecord/CHANGELOG.md
|
| | |
| | |
| | |
| | |
| | | |
It cannot find subclass because all classes are loaded automatically
when it needs.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use the index name explicitly provided in a migration when reverting.
Fixes #8868
Conflicts:
activerecord/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | | |
schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858. this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
cfabianski/disable_prepared_statement_when_preparing_a_query
Unprepared Visitor + unprepared_statement
Conflicts:
activerecord/CHANGELOG.md
|
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Introduced in f1082b8588a9144eedb34d511f0074031f692d98.
Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986.
[ci skip]
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently Post.active.inactive will result in Post.inactive since
the last where clause wins when scopes are merged.
This pull request will merge all scopes ( barring defaul scope)
using AND.
The default scope will be overridden if another scope acts on the
same where clause.
closes #7365
|
|\ \ \
| | | |
| | | | |
test case for `serialize` default values.
|
| | | |
| | | |
| | | |
| | | | |
Closes #9110
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
cache_key consults updated_on timestamp if present
Conflicts:
activerecord/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | |
| | | | |
- Extract max timestamp retrieval for cache_key
- Update changelog for cache_key changes
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
More helpful error message when instantiating an abstract class
Conflicts:
activerecord/CHANGELOG.md
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Calling a literal ActiveRecord::Base.new raises NoMethodError,
since it ends up calling Class.abstract_class? which does not exist.
Similarly, instantiating an actual abstract class hits the database,
when conventionally it should immediately throw NotImplementedError.
ActiveRecord::Base can't be made abstract without breaking many,
many things, so check for it separately.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It was added because a regression caused by a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca
Closes #9255
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Closes #9518.
The rake task used to fail silently and left an empty `structure.sql`.
It's confusing for users to get to the root of the problem.
The warning message tells them where to look.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
As of ccc6910c we use `mysqldump` to create the `structure.sql`.
The old `#structure_dump` code is still in AR but never used.
I removed all relevant parts from the code-base.
|