Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | queue and signal no longer needed | Aaron Patterson | 2011-12-30 | 1 | -2/+0 | |
| | | ||||||
* | | refactor checking out the connection | Aaron Patterson | 2011-12-30 | 1 | -5/+6 | |
| | | ||||||
* | | infinite loop is no longer necessary | Aaron Patterson | 2011-12-30 | 1 | -20/+11 | |
| | | ||||||
* | | connections must be checked in at the end of a thread | Aaron Patterson | 2011-12-30 | 1 | -17/+1 | |
| | | ||||||
* | | Fixes for TestFixtures::setup_fixture_accessors | Alexey Muranov | 2011-12-30 | 1 | -6/+5 | |
| | | | | | | | | | | | | Renamed "fixture_name" to "accessor_name" and made fixture names in the form "admin/users" be used as the key for the hashes @fixture_cache and @loaded_fixtures. Previously the variable "fixture_name" here was getting a value of the form "admin_user", and this value was then used as the hash key. | |||||
* | | Fixture's table name be defined in the model | Alexey Muranov | 2011-12-30 | 1 | -10/+17 | |
| | | | | | | | | | | | | | | | | Made the fixture's table name be taken from its model class whenever this class responds to table_name, instead of inferring it sometimes from the fixture's pass. The previous behavior seemed buggy because it depended on whether the model class was passed as a constant or as a name string. Improved Fixtures#initialize. | |||||
* | | Use foo/bar instead of foo_bar keys for fixtures | Alexey Muranov | 2011-12-30 | 1 | -12/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This solves an issue with set_fixture_class class method caused by create_fixtures method's overwriting passed to it fixture model classes, when the fixtures are "namespased": foo/bar or admin/users. The idea is to use "foo/bar" string as the name and identifier of a fixture file bar in directory foo. The model class of the fixture is either set with set_fixture_class method, or otherwise inferred from its name using camelize method. Also a bug is fixed in lines 487-489 when the table names were guessed by substitution from the fixture file names, ambiguously called table_names, instead of being taken from fixture attributes. Now they are taken from attributes. I plan to submit another fix so that the fixture's table name (for example foo_bar) be defined by the fixture's model whenever possible, instead of inferring it from the fixture's name ("foo/bar"). | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-29 | 3 | -11/+4 | |
|\ \ | ||||||
| * | | typo | Jo Liss | 2011-12-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Document that index names are made up of all columns, not just the first. | Jo Liss | 2011-12-27 | 1 | -9/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed. | |||||
| * | | Remove unnecessary comma. | Uģis Ozols | 2011-12-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 6 | -5/+19 | |
| | | | ||||||
* | | | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | allow reorder to affect eager loading correctly | |||||
| * | | | allow reorder to affect eager loading correctly | Matt Jones + Scott Walker | 2011-12-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | app code in general wants Time.current, not Time.now | Xavier Noria | 2011-12-28 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor | Aaron Patterson | 2011-12-28 | 1 | -35/+37 | |
|\ \ \ \ | | | | | | | | | | | refactor AR::PredicateBuilder.build_from_hash | |||||
| * | | | | refactor AR::PredicateBuilder.build_from_hash | Akira Matsuda | 2011-12-29 | 1 | -35/+37 | |
| | | | | | ||||||
* | | | | | Delete some stray lines | Jon Leighton | 2011-12-28 | 2 | -3/+0 | |
|/ / / / | ||||||
* | | | | Avoid deprecation warning | Jon Leighton | 2011-12-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Support establishing connection on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 16 | -216/+220 | |
| | | | | | | | | | | | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base. | |||||
* | | | | Support configuration on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 19 | -181/+190 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present. | |||||
* | | | | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_value | Jon Leighton | 2011-12-28 | 1 | -2/+5 | |
|\ \ \ \ | |/ / / |/| | | | AR#where with an Array of 2 elements including a nil | |||||
| * | | | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL" | Akira Matsuda | 2011-12-28 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before | |||||
| * | | | no need to compact an already compacted Array | Akira Matsuda | 2011-12-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #4153 from ↵ | Jon Leighton | 2011-12-28 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix | |||||
| * | | | Use the correct table name from fixture | Alexey Muranov | 2011-12-28 | 1 | -2/+2 | |
| |/ / | | | | | | | | | | Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name. Now, the "correct" table name is taken from an instance variable. | |||||
* / / | Revert "This conditions is required to work with database create task. 1.9.2 ↵ | Arun Agrawal | 2011-12-27 | 1 | -2/+1 | |
|/ / | | | | | | | | | | | | | is having a bug with "Calling return within begin still executes else". " No need to worry about 1.9.2 with master This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-25 | 1 | -3/+3 | |
|\ \ | ||||||
| * | | Clarify what persisted? returns. | Uģis Ozols | 2011-12-25 | 1 | -2/+2 | |
| | | | ||||||
| * | | Remove extra 'be'. | Uģis Ozols | 2011-12-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | remove checks for encodings availability | Sergey Nartimov | 2011-12-25 | 2 | -47/+43 | |
| | | | ||||||
* | | | Intercept sends in Model::DeprecationProxy | Jon Leighton | 2011-12-24 | 1 | -0/+2 | |
| | | | ||||||
* | | | deprecate String#encoding_aware? and remove its usage | Sergey Nartimov | 2011-12-24 | 1 | -17/+9 | |
| | | | ||||||
* | | | Fix position of load hook so that Base has been defined and included Model ↵ | Jon Leighton | 2011-12-24 | 2 | -3/+6 | |
| | | | | | | | | | | | | before it runs | |||||
* | | | Add some doc for ActiveRecord::Model | Jon Leighton | 2011-12-24 | 1 | -0/+7 | |
| | | | ||||||
* | | | Add deprecation for the change to the active_record load hook | Jon Leighton | 2011-12-24 | 1 | -1/+24 | |
| | | | ||||||
* | | | Support nested AR::Models | Jon Leighton | 2011-12-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | auto_explain_threshold_in_seconds should be a global config option so it can ↵ | Jon Leighton | 2011-12-24 | 1 | -8/+3 | |
| | | | | | | | | | | | | be shared between AR::Base and AR::Model | |||||
* | | | Don't include anything else if AR::Model has already been included | Jon Leighton | 2011-12-24 | 1 | -0/+2 | |
| | | | ||||||
* | | | Make PredicateBuilder recognise AR::Model | Jon Leighton | 2011-12-24 | 1 | -2/+2 | |
| | | | ||||||
* | | | Ensure attribute methods are included after all the AR stuff | Jon Leighton | 2011-12-24 | 2 | -2/+2 | |
| | | | ||||||
* | | | Fix #exists? for AR::Model | Jon Leighton | 2011-12-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Make generated_feature_methods work with ActiveRecord::Model | Jon Leighton | 2011-12-24 | 1 | -4/+9 | |
| | | | ||||||
* | | | Fixtures support for ActiveRecord::Model | Jon Leighton | 2011-12-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Deal with global config better between AR::Base and AR::Model | Jon Leighton | 2011-12-24 | 9 | -83/+111 | |
| | | | ||||||
* | | | Extract common logic into a method | Jon Leighton | 2011-12-24 | 5 | -28/+30 | |
| | | | ||||||
* | | | I herd you like modules. | Jon Leighton | 2011-12-24 | 11 | -70/+99 | |
| | | | ||||||
* | | | Start work towards making AR include-able. | Jon Leighton | 2011-12-24 | 4 | -369/+390 | |
| | | | ||||||
* | | | Tidy up migration types. | José Valim | 2011-12-24 | 4 | -11/+10 | |
| | | | ||||||
* | | | added ability to specify from cli when generating a model/migration whether ↵ | Dmitrii Samoilov | 2011-12-24 | 4 | -7/+16 | |
| | | | | | | | | | | | | particular property should be an index like this 'rails g model person name:string:index profile:string' |