github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-13 16:47:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,493 Commits 34 Branches 105 Tags
3-1-github
Commit Graph

6372 Commits

Author SHA1 Message Date
Pratik Naik
2d6d8a72a3 Ensure association preloading properly merges default scope and association conditions 2012-08-28 12:50:06 -07:00
Xavier Noria
e6e9e565da CHANGELOGs are now per branch 
Check 810a50d for the rationale.
 2012-08-28 21:46:04 +02:00
Jon Leighton
e08268ba5a Increase benchmark time to 20 seconds. 
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
 2012-08-17 15:20:26 +01:00
Jon Leighton
20d6f70926 Use benchmark/ips to measure AR performance 
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
 2012-08-17 11:57:21 +01:00
Santiago Pastorino
38bf9cf368 Bump to 3.1.8 2012-08-09 16:22:39 -03:00
Santiago Pastorino
e8d78e7836 Add CHANGELOG entries 2012-08-09 16:20:17 -03:00
Aaron Patterson
d314a48a40 bumping to 3.1.7 2012-07-26 14:58:51 -07:00
Aaron Patterson
6cf68d797d updating rails release date 2012-07-26 14:55:18 -07:00
Aaron Patterson
a4b8a7e8ca updating changelog 2012-07-23 14:32:54 -07:00
Xavier Noria
666a48a303 removes item in the Active Record CHANGELOG 
That change to update_attribute was considered
to be too subtle and was reverted in 30ea923
just before Rails 3 shipped. Later we introduced
update_column (Rails 3.1).
 2012-06-14 11:47:27 +02:00
Aaron Patterson
63dce16202 updating changelogs 2012-06-12 14:03:38 -07:00
Aaron Patterson
4e7d571918 bumping version numbers 2012-06-11 15:48:26 -07:00
Aaron Patterson
bee42f3a0a updating changelogs with security fixes 2012-06-11 15:48:04 -07:00
Aaron Patterson
75d039f1d4 adding version number to changelogs 2012-06-11 15:46:26 -07:00
Aaron Patterson
64e30e8b34 Merge branch '3-1-stable-sec' into 3-1-stable-rel 
* 3-1-stable-sec:
  Array parameters should not contain nil values.
  Additional fix for CVE-2012-2661
 2012-06-11 15:42:40 -07:00
Rafael Mendonça França
3e2c00a1dc Mysql and Mysql2 adapters accepts only two arguments in the tables 
method.

Fix build http://travis-ci.org/#!/rails/rails/builds/1594492
 2012-06-11 18:09:09 -03:00
kennyj
8e6ed58e43 Change the string to use in test case. 
Conflicts:

	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
	activerecord/test/cases/adapters/mysql2/schema_test.rb
 2012-06-11 11:27:54 -07:00
kennyj
023eaf8ab9 Fix GH #3163. Should quote database on mysql/mysql2. 
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
 2012-06-11 11:27:45 -07:00
Ernie Miller
8355abf153 Additional fix for CVE-2012-2661 
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.
 2012-06-08 17:26:52 -05:00
Aaron Patterson
aa18c0cac0 bumping to 3.1.5 2012-05-31 10:42:35 -07:00
Aaron Patterson
a7ed19814b updating the CHANGELOG 2012-05-31 10:41:47 -07:00
Aaron Patterson
a9c1898b3e Merge branch '3-1-stable-sec' into 3-1-rel 
* 3-1-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
 2012-05-31 10:29:46 -07:00
Aaron Patterson
b71d4ab9d7 predicate builder should not recurse for determining where columns. 
Thanks to Ben Murphy for reporting this

CVE-2012-2661
 2012-05-30 15:05:19 -07:00
Aaron Patterson
bd8ee8c912 bumping to 3.1.5.rc1 2012-05-28 11:54:56 -07:00
Vijay Dev
ffd3289e73 fix grammar in deprecation message [ci skip] 2012-05-01 19:42:19 +05:30
Santiago Pastorino
5cbb20d053 Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_for_3_1 
Address an error for test_has_many_through_polymorphic_has_one with Oracle
 2012-03-29 13:11:53 -07:00
Yasuo Honda
53db676a5e Address an error for test_has_many_through_polymorphic_has_one 
with Oracle for the 3-1-stable branch
 2012-03-29 13:09:51 -04:00
Arturo Pie
14af116641 refactor instantiate method in base, so we remove nesting if's which make the code harder to read. Minor changes to contain_all_columns in IdentityMap. 2012-03-28 21:05:12 -04:00
Arturo Pie
15a2e0dee2 refactor the checking of the attributes of the record in IdentityMap#add, so it's more readable 2012-03-27 21:59:46 -04:00
Arturo Pie
a00a42dc01 Do not add record to identity map if the record doesn't have values for all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record. 2012-03-27 21:59:46 -04:00
Arturo Pie
488ea89a4b Adds a test that breaks IM when using #select 2012-03-27 21:59:46 -04:00
Aaron Patterson
e95f8e8a2f Merge pull request #2621 from icco/master 
Issue with schema dump
 2012-03-26 17:26:27 -07:00
Carlos Antonio da Silva
c8d5680655 Fix identity map tests 2012-03-23 14:39:42 -03:00
Carlos Antonio da Silva
51bb1c1d7a Add order to tests that rely on db ordering, to fix failing tests on pg 
Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.
 2012-03-23 14:39:37 -03:00
Arun Agrawal
eeee6f2dbe fix test failing in 1.8.7 2012-03-19 11:32:56 +05:30
Denis Jean
b1fe2c6606 fix activerecord query_method regression with offset into Fixnum 
add test to show offset query_methods on mysql & mysql2

change test to cover public API
 2012-03-13 08:53:37 +05:30
Carlos Antonio da Silva
24e074fde8 Only run binary type cast test with encode! on Ruby 1.9 2012-03-04 16:36:45 +01:00
Aaron Patterson
b1358c8fa1 only log an error if there is a logger. fixes #5226 
Conflicts:

	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
 2012-03-02 10:31:12 -08:00
Aaron Patterson
11881ad478 Merge branch '3-1-4' into 3-1-stable 
* 3-1-4:
  bumping to 3.1.4
  Ensure [] respects the status of the buffer.
  updating RAILS_VERSION
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
 2012-03-01 09:51:21 -08:00
Aaron Patterson
1aabea698b bumping to 3.1.4 2012-03-01 09:20:24 -08:00
kennyj
42592b4338 Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. 2012-02-29 01:51:29 +09:00
Noah Hendrix
b5418e7245 Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount 2012-02-25 21:55:22 +05:30
Aaron Patterson
8c677e921a updating RAILS_VERSION 2012-02-22 12:06:09 -08:00
Aaron Patterson
967b300f70 fixing bad merge: adding bind substitution visitor 2012-02-22 11:43:12 -08:00
Aaron Patterson
f290d6f516 prepared statements can be disabled 2012-02-22 10:53:01 -08:00
Aaron Patterson
995d792b56 bumping up arel 2012-02-21 16:13:30 -08:00
Aaron Patterson
79f0a9b642 tag bind params with a bind param object 2012-02-21 15:46:26 -08:00
Aaron Patterson
36c8521ef6 more ruby 2.0 respond_to? changes 2012-02-21 11:38:36 -08:00
Aaron Patterson
f468d6e94f Merge pull request #5096 from lawso017/master 
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
Conflicts:

	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/test/cases/adapters/postgresql/schema_test.rb
 2012-02-21 09:51:47 -08:00
kennyj
daa8686ca4 Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES 2012-01-31 20:53:38 +09:00