github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
27,346 Commits 34 Branches 105 Tags
d92166cb26efa2f0bd8e2adad1b8024beefbfd81
Commit Graph

6920 Commits

Author SHA1 Message Date
Norman Clarke
d92166cb26 Check for nil logger 2012-04-18 14:44:32 -03:00
Xavier Noria
dab76b11f5 Merge pull request #5725 from kevmoo/remove_unused_castcode 
Remove unused castcode
 2012-04-09 10:05:32 -07:00
Rafael Mendonça França
1124ac00c9 Fix tests of benchmark with silence equals to true 2012-04-04 16:14:13 -03:00
Terence Lee
d46ad3460a log which config format AR uses to connect with 2012-04-03 21:59:24 -05:00
Kevin Moore
6f19262719 Remove unused 'cast_code' variable 2012-04-03 17:39:53 -07:00
Tim Pope
8e315b0e0a DATABASE_URL allows omission of database.yml 2012-04-03 15:57:18 -07:00
Aaron Patterson
9894d16653 Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select 
Fixing Identity Map when using find select in rails 3.2
 2012-03-30 16:45:24 -07:00
Santiago Pastorino
69465d9f7c Merge branch '3-2-3' into 3-2-stable 2012-03-30 19:34:33 -03:00
Santiago Pastorino
45d6cd94b3 Bump up to 3.2.3 2012-03-30 19:22:28 -03:00
Jon Leighton
dffbb521a0 Fix #5667. Preloading should ignore scoping. 
Conflicts:

	activerecord/test/cases/associations/eager_test.rb
 2012-03-30 16:24:41 +01:00
Arturo Pie
6896cd4515 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. 
Conflicts:

	activerecord/lib/active_record/base.rb
 2012-03-29 22:39:01 -04:00
Arturo Pie
714a2c810d refactor the checking of the attributes of the record in IdentityMap#add, so it's more readable 2012-03-29 22:24:15 -04:00
Arturo Pie
2c8f84d3a6 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-29 22:24:02 -04:00
Arturo Pie
b29e868cc3 Adds a test that breaks IM when using #select 2012-03-29 22:23:49 -04:00
Santiago Pastorino
5284e650be Bumping to 3.2.3.rc2 2012-03-29 13:12:44 -03:00
Santiago Pastorino
f369f77471 Merge pull request #5640 from yahonda/address_ora_00918_with_oracle 
Address an error for test_has_many_through_polymorphic_has_one with Oracle
 2012-03-28 11:19:50 -07:00
Yasuo Honda
ef3f8093c0 Change the order argument from ('id') to ('taggings.id') 
to address ORA-00918 error
 2012-03-28 13:41:47 -04:00
Jon Leighton
1b9fd797b3 Fix #5549. 2012-03-28 16:09:01 +01:00
Aaron Patterson
4c44ca5cb9 Test for #5549. 
Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796.

Conflicts:

	activerecord/lib/active_record/attribute_methods/read.rb
 2012-03-28 15:31:32 +01:00
Santiago Pastorino
2d5b60e982 Merge pull request #5616 from cbartlett/migration-indent 
Fix indenting in migration generator
 2012-03-28 00:13:48 -03:00
Piotr Sarnacki
c4048b39ff Merge pull request #5618 from lest/patch-1 
force datetime attributes to be changed
 2012-03-27 13:10:43 -07:00
Sergey Nartimov
fdcfc7521f force datetime attributes to be changed 
backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable
 2012-03-27 22:55:50 +03:00
Santiago Pastorino
5f37260918 Bumping to 3.2.3.rc1 2012-03-27 14:07:36 -03:00
Aaron Patterson
3eb5be67b1 Merge pull request #2621 from icco/master 
Issue with schema dump
 2012-03-26 17:26:10 -07:00
Aaron Patterson
0382e44080 Merge pull request #5537 from kennyj/fix_4399-32 
[3-2-stable] migrate(:down) method with table_name_prefix
 2012-03-23 10:50:16 -07:00
Carlos Antonio da Silva
0879ebdf36 Fix identity map tests 2012-03-23 02:21:49 -03:00
Carlos Antonio da Silva
b332891b2a 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-22 22:41:10 -03:00
Marcelo Silveira
35bf748cd2 [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating migration' 2012-03-21 19:43:41 -03:00
kennyj
565bfb9cd4 migrate(:down) method with table_name_prefix 2012-03-21 15:53:27 +09:00
Marcelo Silveira
57c6b4c0fe [3-2-stable] Remove blank line from generated migration 2012-03-20 22:07:09 -03:00
kennyj
f4f9ec1536 Fix GH #5435. db:structure:dump should be re-enable. 2012-03-18 14:19:30 +09:00
Aaron Patterson
bd3e1ed23c Merge pull request #5437 from kennyj/fix_5430 
Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
 2012-03-15 11:12:08 -07:00
Jonathan Rochkind
41563b49a2 ConnectionPool.checkout takes account of ruby using 'non-blocking condition variables' in mutex ConditionVariables 2012-03-13 18:00:55 -04:00
kennyj
21d9c0fc7f [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects. 2012-03-14 02:34:12 +09:00
Denis Jean
f67944e757 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:52:45 +05:30
Aaron Patterson
5f26ce699f make sure connections returned after close are marked as in_use 2012-03-12 11:58:38 -07:00
Aaron Patterson
da0595d7d7 Merge pull request #5391 from jrochkind/connection_pool_doc 
ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
 2012-03-12 09:47:19 -07:00
Jonathan Rochkind
bb8f4c2b11 inline docs for clear_active_connections! no longer says it cleans dead threads, it doesn't since 3.2.0 2012-03-12 11:07:40 -04:00
Andrew White
a01f0ab839 Add documentation for find_or_create_by_{attribute}! method. 2012-03-12 15:03:04 +00:00
Andrew White
90d96353e6 Add dynamic find_or_create_by_{attribute}! method. 
(cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/dynamic_finder_match.rb
 2012-03-12 14:12:22 +00:00
José Valim
2b9041ba96 Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2 
[3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
 2012-03-08 23:28:10 -08:00
Rafael Mendonça França
db743ff459 Fix my name in the CHANGELOG to follow the convention 
Also add missing entries and use the formating convention
 2012-03-09 00:52:19 -03:00
Rafael Mendonça França
f18c0547b0 Not need to pass join attributes to association build 2012-03-08 23:29:28 -03:00
Rafael Mendonça França
7cd4063162 Add test case to has_many through association when mass_assignment_sanitizer is 
:strict

Conflicts:

	activerecord/test/models/person.rb
 2012-03-08 23:29:16 -03:00
Aaron Patterson
94b2c8c32d ensure that released connections move between threads 2012-03-08 16:13:12 -08:00
Aaron Patterson
cff19cf545 make active_connection? return true only if there is an open connection in use for the current thread. fixes #5330 2012-03-08 15:47:18 -08:00
Vijay Dev
3bfd6516c3 changelog updates [ci skip] 2012-03-09 02:07:42 +05:30
Braden Schaeffer
357e288f44 Fix doc examples for has_and_belongs_to_many association 2012-03-09 00:21:57 +05:30
kuahyeow
9bcd6622dd Add tests to test that through associations are not readonly, and we can update the records we retrive from the association 2012-03-08 09:49:21 +13:00
José Valim
524e8a1a80 Merge pull request #5316 from Jacobkg/master 
Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
 2012-03-07 16:08:26 +01:00