aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* fix the method signatureAaron Patterson2014-01-171-1/+1
|
* run the damn tests @tenderloveAaron Patterson2014-01-172-2/+2
|
* Merge branch 'adequaterecord' of github.com:rails/rails into adequaterecordAaron Patterson2014-01-171-1/+0
|\ | | | | | | | | * 'adequaterecord' of github.com:rails/rails: Remove outdated comment.
| * Remove outdated comment.Rafael Mendonça França2014-01-171-1/+0
| | | | | | | | | | | | | | The code duplication was removed and this comment is pointing to the wrong line. [ci skip]
* | oops!Aaron Patterson2014-01-171-1/+1
|/
* don't cache the connection (because we don't need to)Aaron Patterson2014-01-171-8/+7
|
* Revert "adding set_binds"Aaron Patterson2014-01-171-8/+0
| | | | This reverts commit 474ebc55bd13ad58626a49dfc44c8e6407813935.
* remove dead codeAaron Patterson2014-01-172-8/+1
|
* Merge branch 'master' into adequaterecordAaron Patterson2014-01-171-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix eager load of Serializers on Active Model Consistence in the block style Remove warnings on Ruby 2.1 Only some dynamic finders are deprecated. clean up security guide: his => their [ci skip] Remove warning Extract a method to simplify setup code Use minitest's skip rather than conditionals + early returns Move AR test classes inside the test case Do not set up a variable used only in two tests No need for instance vars on single tests Cleanup duplicated setup of callbacks in transactions tests No need to use #send with public methods Update deprecation warning to give more information about caller Update changelog Avoid scanning multiple render calls as a single match. Improve ERB dependency detection.
| * Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
| |
* | change query strategy based on adapterAaron Patterson2014-01-163-4/+51
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-01-161-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Make AR::Base#touch fire the after_commit and after_rollback callbacks Fix test for cache_key + touched Revert "methods are defined right after the module_eval, so we don't need to do" Revert "Don't remove trailing slash from PATH_INFO for mounted apps" Add failing test for #13369 reset column information after fiddling with `Encoding.default_internal` we have `with_env_tz` as global test helper. Remove duplicate. isolate class attribute assignment in `migration_test.rb` use `teardown` for cleanup, not `setup`. tests without transactional fixtures need to cleanup afterwards. no need to `return skip` in tests. `skip` is enough. methods are defined right after the module_eval, so we don't need to do any line number maths Get rid of unused TransactionError constant Avoid converting :on option to array twice when defining commit/rollback callbacks Unify changelog entries about single quotes [ci skip] Use single quotes in generated files
| * Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-161-0/+4
| |
| * Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| | | | | | | | | | | | This has been added 9 years ago in a677da209b16f43198b3485dda89dce862fb9bfb, and removed 6 years ago in 38f8252e2d0a109d1b833d6b289cd989e7bfffe4.
| * Avoid converting :on option to array twice when defining commit/rollback ↵Carlos Antonio da Silva2014-01-151-3/+2
| | | | | | | | callbacks
* | use a params hash so we know what bind parameters are usedAaron Patterson2014-01-152-10/+49
| |
* | fix exception translationAaron Patterson2014-01-142-3/+4
| |
* | translate exceptions on prepared statement failureAaron Patterson2014-01-142-6/+13
| |
* | reorder bind indexes if joins produced bind valuesAaron Patterson2014-01-141-0/+9
| |
* | expliticly make STI column a bind valueAaron Patterson2014-01-141-4/+9
| |
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-142-8/+7
|\| | | | | | | | | | | * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip]
| * directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | | | | | rather than allocating a new Relation, just make the AST directly
| * Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
| |
* | take in to account existing bind parameters when building the bind listAaron Patterson2014-01-141-21/+20
| |
* | comment out the sqlite3 debug code (for now)Aaron Patterson2014-01-141-0/+7
| |
* | fix cache class interfaceAaron Patterson2014-01-141-5/+17
| |
* | unscoping a where should remove bind valuesAaron Patterson2014-01-141-0/+2
| |
* | remove dead codeAaron Patterson2014-01-141-2/+0
| |
* | where needs to bring the bind params when creating a new relationAaron Patterson2014-01-141-0/+3
| |
* | we should not be copying these. fixes ↵Aaron Patterson2014-01-141-4/+0
| | | | | | | | test_find_all_using_where_with_relation_with_bound_values
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-143-16/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * master: don't establish a new connection when testing with `sqlite3_mem`. sqlite >= 3.8.0 supports partial indexes Don't try to get the subclass if the inheritance column doesn't exist Enum mappings are now exposed via class methods instead of constants. Fix fields_for documentation with index option [ci skip] quick pass through Active Record CHANGELOG. [ci skip] [ci skip] Grammar correction single quotes for controller generated routes [ci skip] Added alias to CSRF Set NameError#name
| * sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-141-1/+17
| |
| * Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-141-7/+15
| | | | | | | | | | | | | | The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2.
| * Enum mappings are now exposed via class methods instead of constants.Godfrey Chan2014-01-141-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 }
| * Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-141-1/+1
| |\ | | | | | | Set NameError#name
| | * Set NameError#nameChulki Lee2014-01-131-1/+1
| | |
* | | explains for prepared statements should never have binds in SQLite3Aaron Patterson2014-01-131-1/+1
| | |
* | | fixing column alias resolutionAaron Patterson2014-01-131-1/+1
| | |
* | | replace bind values on calls to to_sqlAaron Patterson2014-01-132-4/+8
| | |
* | | do not clear out bind parameters on unscopeAaron Patterson2014-01-131-3/+0
| | |
* | | Merge branch 'master' into set_bindsAaron Patterson2014-01-133-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) unscope should remove bind values associated with the where reverse_order_value= is not private, so no need to send avoid more dynamic symbols no need to to_sym recover from test runs that leave the database in a bad state updates screenshot data [ci skip] "serie" => "series" revises a few things in the getting started guide [ci skip] Favor canonical environment variables for secrets removed extra comma [ci skip] Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. Updated Changelog to reflect removal of :dependent => :restrict standardize on jruby_skip & rbx_skip fix bug in becomes! when changing from base to subclass. Closes #13272. highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] Skip Spring App Generator tests on JRuby fixes a typo in a CHANGELOG upgrade SDoc fixes the Gemfile generator templates ... Conflicts: activerecord/test/cases/hot_compatibility_test.rb
| * | unscope should remove bind values associated with the whereAaron Patterson2014-01-131-0/+2
| | |
| * | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
| | | | | | | | | | | | It's not public API, but is not private scoped.
| * | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
| | |
| * | no need to to_symAaron Patterson2014-01-131-2/+2
| |/
| * fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-131-1/+5
| |
| * use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13650, #13672 This is an alternate implementation to solve #13650. Currently form fields contain the enum value (eg. "1"). This breaks because the setter `enum=` expects the label (eg. "active"). ActiveRecord::Enum allows you to use labels in your application but store numbers. We should make sure that all parts after AR are dealing with labels and not the underlying mapping to a number. This patch defines `_before_type_cast` on every enum column to return the label. This method is later used to fetch the value to display in form fields. I deliberately copied the implementation of the enum getter instead of delegating to it. This allows you to overwrite the getter and for example return a `Value Object` but have it still work for form fields.
* | adding bind values to the manager objectAaron Patterson2014-01-135-9/+11
| |
* | bubble bind parameters up when building join dependenciesAaron Patterson2014-01-133-9/+19
| |
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-11124-3226/+4107
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (2794 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: activerecord/lib/active_record/associations/join_dependency/join_association.rb activerecord/lib/active_record/relation/query_methods.rb