Due to a change in builder, nil values now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. Changes in Active Model, Active Record and Active Support tests. Cherry-pick of d65adc7, 77dd3be and 146eaf3. Fix build.
I think that 5 seconds was a bit low for our purposes. Also enable it to be configured via env vars. We also need to scale the number of records up/down depending on how long we're running the benchmark for. Conflicts: activerecord/examples/performance.rb
This means we can more easily compare numbers, and we don't have to specify a single N for all reports, which previously meant that some tests were running many more/fewer iterations than necessary. Conflicts: Gemfile activerecord/examples/performance.rb
Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
While the patched PredicateBuilder in 3.1.5 prevents a user from specifying a table name using the `table.column` format, it doesn't protect against the nesting of hashes changing the table context in the next call to build_from_hash. This fix covers this case as well.
Thanks to Ben Murphy for reporting this CVE-2012-2661
with Oracle for the 3-1-stable branch
…make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
…add, so it's more readable
…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.