aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3810 from lest/fix-warningsJosé Valim2011-11-307-40/+35
|\ | | | | fix method redefined warnings in tests
| * fix method redefined warning in activemodellest2011-11-302-1/+5
| |
| * fix deprecation warnings in activeresourcelest2011-11-302-27/+25
| |
| * fix method redefined warnings in testslest2011-11-303-12/+5
|/
* Merge pull request #3809 from lest/test-helpers-in-erbJosé Valim2011-11-301-0/+2
|\ | | | | fix warning in tests when using render_erb helper
| * fix warning in tests when using render_erb helperlest2011-11-301-0/+2
| |
* | Merge pull request #3806 from lest/test-helpers-in-erbJosé Valim2011-11-306-17/+31
|\| | | | | Test helpers in erb using erb
| * test helpers in erb using erblest2011-11-306-17/+31
|/
* Merge pull request #1915 from bogdan/active_record_mapJon Leighton2011-11-306-2/+62
|\ | | | | ActiveRecord::Base.map method for direct select by single column
| * ActiveRecord::Relation#pluck methodBogdan Gusiev2011-11-306-2/+62
| |
* | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵José Valim2011-11-307-8/+50
| | | | | | | | a before callback halts.
* | Update sprockets which theoretically fixes the regression we have seen.José Valim2011-11-301-1/+1
| |
* | Fixes for using action view template in isolation.José Valim2011-11-303-2/+12
|/
* Module#synchronize is deprecated with no replacement. Please use `monitor` ↵Aaron Patterson2011-11-293-89/+5
| | | | from ruby's standard library.
* push synchronization in to each method. Reduces method calls and makesAaron Patterson2011-11-291-25/+29
| | | | it clear which methods are synchronized.
* Automatic closure of connections in threads is deprecated. For exampleAaron Patterson2011-11-294-27/+31
| | | | | | | | | | | | | | | | | the following code is deprecated: Thread.new { Post.find(1) }.join It should be changed to close the database connection at the end of the thread: Thread.new { Post.find(1) Post.connection.close }.join Only people who spawn threads in their application code need to worry about this change.
* AbstractAdapter#close can be called to add the connection back to theAaron Patterson2011-11-293-11/+35
| | | | pool.
* Start implementing @reserved_connections in terms of connection leases.Aaron Patterson2011-11-291-3/+3
|
* Rename `checked_out` to more descriptive `active_connections`Aaron Patterson2011-11-291-3/+3
|
* Use connection lease to determine "checked_out" connectionsAaron Patterson2011-11-291-17/+21
|
* expire will set in_use to falseAaron Patterson2011-11-292-0/+12
|
* last_use is set on connection leaseAaron Patterson2011-11-291-0/+6
|
* Leased connections return false on second leaseAaron Patterson2011-11-292-4/+15
|
* Adapters keep in_use flag when leasedAaron Patterson2011-11-292-1/+30
|
* namespace the adapter testAaron Patterson2011-11-291-121/+123
|
* Fix ruby 1.8 compat. const_defined? only takes a second arg on 1.9.Jon Leighton2011-11-291-3/+4
|
* Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`Jon Leighton2011-11-296-66/+60
| | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated.
* Deprecate set_locking_column in favour of self.locking_column=Jon Leighton2011-11-294-10/+56
|
* Deprecate set_primary_key in favour of self.primary_key=Jon Leighton2011-11-2918-43/+71
|
* Make sure the original_foo accessor still works (but deprecated) if we are ↵Jon Leighton2011-11-292-13/+86
| | | | using self.foo=
* extract methodJon Leighton2011-11-291-49/+25
|
* Deprecate set_sequence_name in favour of self.sequence_name=Jon Leighton2011-11-295-16/+38
|
* Add tests for set_sequence_name etcJon Leighton2011-11-292-1/+23
|
* Deprecate set_inheritance_column in favour of self.inheritance_column=Jon Leighton2011-11-295-24/+48
|
* Deprecate set_table_name in favour of self.table_name= or defining your own ↵Jon Leighton2011-11-2921-72/+138
| | | | method.
* respond_to? information of AR is not the responsibility of the specAaron Patterson2011-11-292-8/+10
| | | | resolver.
* Merge pull request #3636 from joshsusser/masterJon Leighton2011-11-2914-23/+112
|\ | | | | association methods are now generated in modules
| * don't change class definition in test caseJosh Susser2011-11-292-6/+4
| |
| * avoid warningsJosh Susser2011-11-276-15/+15
| | | | | | | | | | | | | | This change uses Module.redefine_method as defined in ActiveSupport. Making Module.define_method public would be as clean in the code, and would also emit warnings when redefining an association. That is pretty messy given current tests, so I'm leaving it for someone else to decide what approach is better.
| * changelog & docs for GeneratedFeatureMethodsJosh Susser2011-11-272-0/+26
| |
| * use GeneratedFeatureMethods module for associationsJosh Susser2011-11-277-15/+57
| |
| * add test for super-ing to association methodsJosh Susser2011-11-151-2/+12
| |
| * association methods are now generated in modulesJosh Susser2011-11-159-30/+43
| | | | | | | | | | | | | | | | | | | | Instead of generating association methods directly in the model class, they are generated in an anonymous module which is then included in the model class. There is one such module for each association. The only subtlety is that the generated_attributes_methods module (from ActiveModel) must be forced to be included before association methods are created so that attribute methods will not shadow association methods.
* | Fix resolver_test.rb on travis (postgresql isn't setup, so it can't load the ↵Jon Leighton2011-11-291-6/+6
| | | | | | | | connection adapter)
* | Fix schema_cache_test.rb for sqlite3_memJon Leighton2011-11-291-6/+0
| |
* | Merge pull request #3797 from HeeL/testVijay Dev2011-11-291-1/+8
|\ \ | | | | | | splited a long line to shorter ones
| * | splited a long line to shorter onesSergey Parizhskiy2011-11-291-1/+8
|/ /
* | Merge pull request #3790 from masterkain/patch-1Vijay Dev2011-11-291-1/+1
|\ \ | | | | | | Fix typo in AS::TaggedLogging
| * | Fix typo in AS::TaggedLoggingClaudio Poli2011-11-291-1/+1
| | |
* | | Merge pull request #3793 from marcandre/asset_hostJosé Valim2011-11-282-2/+10
|\ \ \ | |/ / |/| | Handle correctly optional parameters for callable asset_host.