aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add test to AR's counter_cache_test.rbTakehiro Adachi2013-05-183-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1 4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass more then one association to the `reset_counters` method.
* | | | stop swallowing exceptions in assert_queries. Methods that raise anAaron Patterson2013-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | exception are unlikely to pass this assertion, but since the assertions raise an exception, the original exception is lost.
* | | | stop doing assingments in an iteratorAaron Patterson2013-05-171-2/+6
| | | |
* | | | include bind values from the default scopeAaron Patterson2013-05-172-6/+5
|/ / /
* | | let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| | |
* | | test refactorAaron Patterson2013-05-161-5/+2
| | |
* | | Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-163-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | begin Topic.new("hello" => "world") rescue ActiveRecord::UnknownAttributeError => e e.record # => #<Topic ... > e.attribute # => "hello" end
* | | Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-163-1/+17
|\ \ \ | | | | | | | | Support array as root element in Postgresql JSON columns
| * | | Support array as root element in JSONAlexey Noskov2013-05-143-1/+17
| | | |
* | | | Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
| | | |
* | | | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
| | | | | | | | | | | | | | | | Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
* | | | tiny types should only be integers when the length is <= 1. fixes #10620Aaron Patterson2013-05-151-3/+9
| | | |
* | | | add failing test exposing mysql adapter tinyint bugphinze2013-05-151-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | in myself, a column with type TINYINT(N) where N > 1 can be used to represent an integer, but the rails mysql adapter refuses to interpret as anything but a boolean.
* | | | require things we needAaron Patterson2013-05-151-0/+1
| | | |
* | | | Merge pull request #10504 from kennyj/support_pg_91Rafael Mendonça França2013-05-153-6/+8
|\ \ \ \ | | | | | | | | | | Also should supports PostgreSQL 9.1 about extensions.
| * | | | Remove unnecessary code, because this extension is created on demand in ↵kennyj2013-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | hstore_test.rb.
| * | | | Also support extensions in PostgreSQL 9.1, because this has been supported ↵kennyj2013-05-152-4/+8
| | | | | | | | | | | | | | | | | | | | since 9.1.
* | | | | Merge pull request #10601 from Ichimonji10/fix-docsRafael Mendonça França2013-05-151-15/+27
|\ \ \ \ \ | |/ / / / |/| | | | Rewrite `activerecord/RUNNING_UNIT_TESTS.rdoc`
| * | | | Rewrite `activerecord/RUNNING_UNIT_TESTS`Jeremy Audet2013-05-151-15/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | `RUNNING_UNIT_TESTS` is written in an unclear and confusing manner. This commit attempts to correct that. Thanks to zzak and vipulnsward for feedback.
* | | | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
| | | |
* | | | Merge branch 'master' into normalizecbAaron Patterson2013-05-1317-50/+137
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (61 commits) add tests for reset_calbacks Fixing build broken by this change Extract variable out of loop Updated comment to Rails 4 Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext better error message when app name is not passed in `rails new` Code cleanup for ActionDispatch::Flash#call Fix typo: require -> requires Add CHANGELOG entry for #10576 Merge pull request #10556 from Empact/deprecate-schema-statements-distinct Some editorial changes on the documentation. respond_to -> respond to in a message from AM::Lint specify that dom_(id|class) are deprecated in controllers, views are fine copy edits [ci skip] Fix class and method name typos Replace multi_json with json ruby -> Ruby Adding documentation to the automatic inverse_of finder. Improve CHANGELOG entry [ci kip] Call assume_migrated_upto_version on connection ... Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | Merge pull request #10577 from vipulnsward/fix_method_typosRafael Mendonça França2013-05-123-3/+3
| |\ \ \ | | | | | | | | | | Fix class and method name typos
| | * | | Fix class and method name typosVipul A M2013-05-123-3/+3
| | | | |
| * | | | Merge pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-123-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc. Conflicts: activerecord/CHANGELOG.md
| * | | | Some editorial changes on the documentation.Rafael Mendonça França2013-05-122-27/+27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some autolinks * Fix the rendered result * Change sql to SQL [ci skip]
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-125-5/+13
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| | * | copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| | | |
| | * | Added documentation for ↵aditya-kapoor2013-05-101-0/+4
| | | | | | | | | | | | | | | | ActiveRecord::Generators::MigrationGenerator.next_migration_number
| | * | Added documentation for ActiveRecord::Base#next_migration_numberaditya-kapoor2013-05-091-0/+5
| | | |
| | * | minor rdoc cleanup for reflection methodsNeeraj Singh2013-05-091-4/+4
| | | |
| | * | XML-files isn't a wordWaynn Lue2013-05-061-1/+1
| | | |
| | * | added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| | | |
| * | | Adding documentation to the automatic inverse_of finder.wangjohn2013-05-112-1/+22
| | | |
| * | | Improve CHANGELOG entry [ci kip]Rafael Mendonça França2013-05-111-6/+10
| | | |
| * | | Call assume_migrated_upto_version on connectionKyle Stevens2013-05-113-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call assume_migrated_upto_version on connection to prevent it from first being picked up in method_missing. In the base class, Migration, method_missing expects the argument to be a table name, and calls proper_table_name on the arguments before sending to connection. If table_name_prefix or table_name_suffix is used, the schema version changes to prefix_version_suffix, breaking `rake test:prepare`. Fixes #10411.
| * | | Merge pull request #10567 from ↵Rafael Mendonça França2013-05-113-1/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | neerajdotname/read_attribute_before_type_cast_should_accept_symbol read_attribute_before_type_cast should accept symbol
| | * | | read_attribute_before_type_cast should accept symbolNeeraj Singh2013-05-113-1/+7
| | | | |
| * | | | Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-keyRafael Mendonça França2013-05-111-2/+1
| |/ / / | | | | | | | | | | | | Don't modify args in TableDefinition#primary_key
* / / / callbacks are wrapped with lambdasAaron Patterson2013-05-101-1/+1
|/ / /
* | | Extract JoinDependency#join_relation to DRY the repeated application of the ↵Ben Woosley2013-05-103-7/+9
| | | | | | | | | | | | #join_associations.
* | | In #apply_join_dependency, we can apply the #where in-place because relation ↵Ben Woosley2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | is always a new object. Thanks to the #except we call at the top of the method.
* | | DRY-up join dependency creation by extracting construct_join_depdencyBen Woosley2013-05-101-7/+5
| | |
* | | Pull the excepts into apply_join_dependency, for the sake of DRY.Ben Woosley2013-05-101-3/+4
| | |
* | | Simplify conditions within apply_join_dependencyBen Woosley2013-05-101-9/+5
| | |
* | | Move the except(:select) inside the construct_limited_ids_condition method ↵Ben Woosley2013-05-101-2/+2
| | | | | | | | | | | | to pair it closely with its motivation.
* | | Reject blank order_values within #columns_for_distinct, as the orders aren't ↵Ben Woosley2013-05-102-3/+3
| | | | | | | | | | | | used at all on non-postgres adapters.
* | | Move #proxy_association method to AssociationRelationJon Leighton2013-05-103-4/+6
| | |
* | | Merge pull request #6792 from Empact/postgres-distinctJon Leighton2013-05-105-12/+61
|\ \ \ | | | | | | | | Fix that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"
| * | | Fix that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"Ben Woosley2013-05-105-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The combination of a :uniq => true association and the #distinct call in #construct_limited_ids_condition combine to create invalid SQL, because we're explicitly selecting DISTINCT, and also sending #distinct on to AREL, via the relation#distinct_value. Rather than build a select distinct clause in #construct_limited_ids_condition, I set #distinct! and pass just the columns into the select statement. This requires introducing a #columns_for_distinct method to return the select columns but not the statement itself.
* | | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+6
| | | |