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
14,159 Commits 34 Branches 105 Tags
28f31f5d625f376bfcdbd67aca3cf03399b02c61
Commit Graph

2830 Commits

Author SHA1 Message Date
Pratik Naik
b04230e3bb Merge remote branch 'mainstream/master' 
Conflicts:
	actionpack/lib/action_controller/metal/flash.rb
 2010-01-17 03:20:30 +05:30
Pratik Naik
6e3bee6cf1 Cache Model.arel_table 2010-01-17 03:14:17 +05:30
Pratik Naik
6806483b91 Use arel_table[] instead of unscoped[] to get arel attribute 2010-01-17 03:10:07 +05:30
Pratik Naik
0ab30637dd Revert "Fix #microseconds conversion and #fast_string_to_time" 
This reverts commit 717a2941e1. Bunch of failures when running postgresql tests.
 2010-01-17 03:04:11 +05:30
Pratik Naik
cd90dcb1bd Rename Model.active_relation to Model.unscoped 2010-01-17 03:00:56 +05:30
Pratik Naik
468cfcedd3 Improve the error message for class mismatch on Relation#merge 2010-01-17 02:08:42 +05:30
Santiago Pastorino
867829b187 Missings do added to with_scope 2010-01-16 17:22:01 -02:00
Pratik Naik
7f8d4d3c4e Get rid of Base#merge_includes 2010-01-16 23:59:57 +05:30
Pratik Naik
07e41a8361 No need to set @arel_engine to nil twice. Committed by mistake in 3968825f 2010-01-16 23:17:14 +05:30
Pratik Naik
3968825f5f Make sure Model#active_relation always adds STI conditions if needed 2010-01-16 23:11:35 +05:30
Pratik Naik
cfdfd89926 Use new finder methods for association preloading 2010-01-16 22:14:10 +05:30
Pratik Naik
f80be3ea0f Use Relation#apply_finder_options from calculations 2010-01-16 22:05:01 +05:30
Pratik Naik
61e831564a Add Relation#apply_finder_options for applying old finder options 2010-01-16 21:21:20 +05:30
Pratik Naik
5a52523a80 Rename active_relation_engine -> arel_engine and active_relation_table -> arel_table 2010-01-16 16:02:30 +05:30
Chris Hapgood
717a2941e1 Fix #microseconds conversion and #fast_string_to_time 
* Use direct integer parsing in #fast_string_to_time to avoid convoluted
   conversions and errors due to truncation.
 * Use Float#round in #microseconds to avoid truncation errors.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2010-01-16 15:21:36 +13:00
Pratik Naik
81cd11259c Remove protected method Class#scoped? 2010-01-16 04:38:16 +05:30
Pratik Naik
2d0bc08a7e Make type_condition return Arel predicate and not a string condition 2010-01-16 04:21:18 +05:30
Pratik Naik
99dd107760 Remove unused default_select 2010-01-16 04:21:18 +05:30
Pratik Naik
2ee130abec Remove scope related code from construct_join 2010-01-16 03:51:10 +05:30
Pratik Naik
21ce8eac9b Remove stale construct_* methods 2010-01-16 03:37:04 +05:30
Pratik Naik
951e485b88 Remove construct_conditions 2010-01-16 02:56:13 +05:30
Pratik Naik
6c997c3c39 Simplify Model.delete_all 2010-01-16 02:38:19 +05:30
Pratik Naik
c5f3811a49 Model.delete should just use scoped.delete 2010-01-16 02:35:53 +05:30
Pratik Naik
3da29f647b Remove AR#scope() method 2010-01-16 01:42:01 +05:30
Pratik Naik
bed9179aa1 Make scopes use relations under the hood 2010-01-16 00:02:46 +05:30
José Valim
88dd60298e Do not send the whole controller in notifications, cherry pick required pieces. 2010-01-15 12:24:31 +01:00
José Valim
6932f6751e ActiveRecord should give the connection id as payload, and not the whole connection. 2010-01-15 12:24:31 +01:00
José Valim
8c8942ed4f Move Dispatcher setup to Railties and add instrumentation hook. 2010-01-15 12:24:30 +01:00
José Valim
363545aa20 Different nested validations should not be ignore [#3638 status:resolved] 2010-01-14 01:46:27 +01:00
José Valim
f921ad5c97 Tidy up ActiveRecord and Views runtime information on process action logger. 2010-01-14 01:07:03 +01:00
José Valim
da5978c223 Add subscriber for ActionPack and move all logging inside it. 2010-01-13 01:19:23 +01:00
José Valim
8d78a82d79 Deprecate ActiveRecord::Base.colorize_logging. 2010-01-13 01:19:23 +01:00
José Valim
743cafb7f4 Create Rails::Subscriber::TestHelper and use it to make ActiveRecord subscriber tests run in both sync and async scenarios. 2010-01-13 01:19:23 +01:00
José Valim
dc2e291a93 Move AR logging responsibilities to ActiveRecord::Railties::Subscriber. 2010-01-13 01:19:23 +01:00
José Valim
7f25ccf38d Remove allow_concurrency and verification_timeout from ActiveRecord::Base (deprecated since 2.2). 2010-01-13 01:19:23 +01:00
José Valim
1a275730b2 Set deprecation warnings for RAILS_ENV and RAILS_DEFAULT_LOGGER. 2010-01-13 01:19:22 +01:00
Chad Woolley
b9a7ec6db5 reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 was getting negative and changing values for ID field. See http://www.sqlite.org/datatypes.html 
Signed-off-by: Yehuda Katz <wycats@gmail.com>
 2010-01-12 11:01:49 -08:00
Pratik Naik
006519d2c9 Use Relation#except for reversing the order 2010-01-12 22:55:57 +05:30
Pratik Naik
4938a5746d Ensure using proper engine for Arel::Table 2010-01-12 22:37:26 +05:30
Pratik Naik
a04486dc99 Delay building arel relation as long as possible for improved introspection 2010-01-12 22:25:55 +05:30
José Valim
cccb998800 Expose connections available in the connection pool. 2010-01-11 23:38:18 +01:00
José Valim
c1239e6509 Send the connection in AR notifications to avoid checking out new connections in threads just for logging purposes. 2010-01-11 15:14:52 +01:00
José Valim
7e6530b170 Merge remote branch 'eloy/master' 2010-01-09 00:23:29 +01:00
José Valim
93898b389b Ensure new validates works with uniqueness validator. 2010-01-08 23:50:31 +01:00
Jeffrey Hardy
652d1c19ea Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults to 'db/migrate' 
[#3671 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-01-08 13:08:23 -08:00
Eloy Duran
7f775ef1a9 Renamed AssociationReflection #collection_association? to #collection?. 2010-01-08 21:47:17 +01:00
Eloy Duran
f2aacd5140 Rollback the transaction when one of the autosave associations fails to save. [#3391 state:resolved] 2010-01-08 21:45:02 +01:00
Lawrence Pit
5193fe9dd7 Exclude unchanged records from the collection being considered for autosave. [#2578 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2010-01-08 21:45:02 +01:00
Jeremy Kemper
4300f94533 Revert "Remove connection method definition, since it's called just once." 
Restore the connection method which was added so it can be overridden.

This reverts commit e428c75d2b.
 2010-01-07 13:30:51 -08:00
José Valim
423e2acbb7 Merge remote branch 'eloy/master' 2010-01-07 20:13:07 +01:00