Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | schema cache already has the columns as a hash, so use that | Aaron Patterson | 2012-11-25 | 2 | -2/+12 |
| | |||||
* | speed up fixture loading by querying the schema cache for column names | Aaron Patterson | 2012-11-25 | 2 | -2/+11 |
| | |||||
* | Don't call will_change! for datetime nil->"". | Alisdair McDiarmid | 2012-11-25 | 3 | -0/+21 |
| | | | | | | | Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Fix #8310 | ||||
* | Fix changelog entry about fast_string_to_time fix | Carlos Antonio da Silva | 2012-11-24 | 1 | -2/+2 |
| | | | | | Introduced in 53ca22f2e11cd3050d75385bc31b6bb5055a2738. Thanks @rochefort. [ci skip] | ||||
* | Move initialize_copy method around to let new method / build alias closer | Carlos Antonio da Silva | 2012-11-24 | 1 | -8/+8 |
| | |||||
* | Merge pull request #8291 from senny/8265_build_with_polymorphic_association | Rafael Mendonça França | 2012-11-22 | 3 | -1/+15 |
|\ | | | | | | | | | | | | | prevent mass assignment of polymorphic type when using `build` Conflicts: activerecord/CHANGELOG.md | ||||
| * | prevent mass assignment of polymorphic type when using `build` | Yves Senn | 2012-11-22 | 3 | -1/+15 |
| | | | | | | | | Closes #8265 | ||||
* | | Remove the #sum method from CollectionAssociation | Carlos Antonio da Silva | 2012-11-21 | 1 | -9/+0 |
| | | | | | | | | | | | | | | Since edd94cee9af1688dd036fc58fd405adb30a5e0da, CollectionProxy delegates all calculation methods - except count - to the scope, which does basically what this method was doing, but since we're delegating from the proxy, the association method was never called. | ||||
* | | Deprecate Relation#sum with a block. | Carlos Antonio da Silva | 2012-11-21 | 5 | -3/+22 |
| | | | | | | | | | | | | | | To perform a sum calculation over the array of elements, use to_a.sum(&block). Please check the discussion in f9cb645dfcb5cc89f59d2f8b58a019486c828c73 for more context. | ||||
* | | Revert "Yield only one argument instead of splatting." | Carlos Antonio da Silva | 2012-11-21 | 3 | -37/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9cb645dfcb5cc89f59d2f8b58a019486c828c73. Conflicts: activerecord/CHANGELOG.md Revert "Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks" This reverts commit 9cc2bf69ce296b7351dc612a8366193390a305f3. Conflicts: activerecord/lib/active_record/relation/calculations.rb | ||||
* | | Don't allocate new strings in compiled attribute methods | Jon Leighton | 2012-11-21 | 3 | -21/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves memory and performance without having to use symbols which present DoS problems. Thanks @headius and @tenderlove for the suggestion. This was originally committed in f1765019ce9b6292f2264b4601dad5daaffe3a89, and then reverted in d3494903719682abc0948bef290af0d3d7b5a440 due to it causing problems in a real application. This second attempt should solve that. Benchmark --------- require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') class Post < ActiveRecord::Base connection.create_table :posts, force: true do |t| t.string :name end end post = Post.create name: 'omg' Benchmark.ips do |r| r.report('Post.new') { Post.new name: 'omg' } r.report('post.name') { post.name } r.report('post.name=') { post.name = 'omg' } r.report('Post.find(1).name') { Post.find(1).name } end Before ------ Calculating ------------------------------------- Post.new 1419 i/100ms post.name 7538 i/100ms post.name= 3024 i/100ms Post.find(1).name 243 i/100ms ------------------------------------------------- Post.new 20637.6 (±12.7%) i/s - 102168 in 5.039578s post.name 1167897.7 (±18.2%) i/s - 5186144 in 4.983077s post.name= 64305.6 (±9.6%) i/s - 317520 in 4.998720s Post.find(1).name 2678.8 (±10.8%) i/s - 13365 in 5.051265s After ----- Calculating ------------------------------------- Post.new 1431 i/100ms post.name 7790 i/100ms post.name= 3181 i/100ms Post.find(1).name 245 i/100ms ------------------------------------------------- Post.new 21308.8 (±12.2%) i/s - 105894 in 5.053879s post.name 1534103.8 (±2.1%) i/s - 7634200 in 4.979405s post.name= 67441.0 (±7.5%) i/s - 337186 in 5.037871s Post.find(1).name 2681.9 (±10.6%) i/s - 13475 in 5.084511s | ||||
* | | Move migration test together with other join table tests | Carlos Antonio da Silva | 2012-11-21 | 2 | -7/+6 |
|/ | |||||
* | Merge pull request #7716 from steveklabnik/issue_7715 | Rafael Mendonça França | 2012-11-21 | 2 | -1/+8 |
|\ | | | | | Coerce strings in create_join_table. | ||||
| * | Coerce strings in create_join_table. | Steve Klabnik | 2012-11-21 | 2 | -1/+8 |
| | | | | | | | | | | | | | | If you accidentally pass a string and a symbol, this breaks. So we coerce them both to strings. Fixes #7715 | ||||
* | | Typo | Chris Patuzzo | 2012-11-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6245 from bogdan/bc_timestamp | Rafael Mendonça França | 2012-11-21 | 4 | -3/+24 |
|\ \ | | | | | | | Postgresql adapter: fix handling of BC timestamps | ||||
| * | | Fix postgresql adapter to handle bc timestamps correctly | Bogdan Gusiev | 2012-11-21 | 4 | -3/+24 |
| | | | |||||
* | | | Refactoring, testing and documenting pg_connection.distinct | Semyon Perepelitsa | 2012-11-21 | 2 | -13/+39 |
|/ / | |||||
* | | Remove return guard and use code convetions | Rafael Mendonça França | 2012-11-20 | 1 | -7/+11 |
| | | |||||
* | | Postgresql doesn't accepts limits on text columns. | Victor Costan | 2012-11-20 | 4 | -0/+35 |
| | | |||||
* | | Be a bit less conservative with mysql in adapter | Carlos Antonio da Silva | 2012-11-19 | 1 | -1/+1 |
| | | |||||
* | | Remove not needed begin..end from AR#save | Carlos Antonio da Silva | 2012-11-19 | 1 | -5/+3 |
| | | |||||
* | | Initialize accessors to remove some warnings in Ruby 2.0 | Carlos Antonio da Silva | 2012-11-19 | 2 | -7/+4 |
| | | |||||
* | | Merge pull request #3023 from Tho85/preserve_sti_type | Rafael Mendonça França | 2012-11-18 | 3 | -2/+31 |
|\ \ | | | | | | | | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md | ||||
| * | | AR::Base.becomes should not change the STI type | Thomas Hollstegge | 2012-11-17 | 3 | -2/+31 |
| | | | | | | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead | ||||
* | | | Add rename_index to change_table. | Jarek Radosz | 2012-11-19 | 3 | -0/+23 |
| | | | |||||
* | | | Ensure ordering to make the test pass with postgresql | Carlos Antonio da Silva | 2012-11-18 | 1 | -4/+5 |
| | | | |||||
* | | | Add test to ensure preloading works as expected with "select" and "includes". | Dieter Komendera | 2012-11-18 | 1 | -0/+13 |
| | | | | | | | | | | | | This didn't work in rails 3.1. See #2303 for more information and original pull request. | ||||
* | | | Remove not used require and some useless test comments | Carlos Antonio da Silva | 2012-11-17 | 2 | -14/+3 |
| | | | |||||
* | | | Bump mysql gem version to the newly 2.9.0, fix build. | Carlos Antonio da Silva | 2012-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typo in module name and make #in_time_zone private | Carlos Antonio da Silva | 2012-11-17 | 3 | -3/+5 |
| | | | |||||
* | | | Extract #in_time_zone helper method duplication to a module | Carlos Antonio da Silva | 2012-11-17 | 3 | -24/+17 |
| | | | |||||
* | | | Simplify helper method in attribute methods test | Carlos Antonio da Silva | 2012-11-17 | 1 | -3/+1 |
| | | | |||||
* | | | Remove return guard | Carlos Antonio da Silva | 2012-11-17 | 2 | -3/+1 |
|/ / | |||||
* | | Add a deprecation before removing find_table_name | Alexey Muranov | 2012-11-17 | 1 | -0/+6 |
| | | | | | | The `ActiveRecord::Fixtures::find_table_name` method was removed from "master" almost a year ago, but it was never deprecated. Here it comes back, more dead than alive. | ||||
* | | Fix some AR changelog entries [ci skip] | Carlos Antonio da Silva | 2012-11-16 | 1 | -6/+5 |
| | | |||||
* | | Test for has_many bug on unsaved records | George Brocklehurst | 2012-11-16 | 1 | -0/+7 |
| | | | | | | | | See issue #7950. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 22 | -204/+204 |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | | 1.9 Syntax related changes | AvnerCohen | 2012-11-10 | 15 | -93/+93 |
| | | | |||||
| * | | 1.9 hash syntax changes | AvnerCohen | 2012-11-08 | 7 | -111/+111 |
| | | | |||||
* | | | arel columns can be used for grouping so that "weird" column names are usable | Aaron Patterson | 2012-11-15 | 3 | -0/+11 |
| | | | |||||
* | | | stop hardcoding FrontBase adapter conditionals | Aaron Patterson | 2012-11-15 | 1 | -1/+1 |
| | | | |||||
* | | | stop passing *args to generate aliases | Aaron Patterson | 2012-11-15 | 1 | -4/+2 |
| | | | |||||
* | | | create fewer relation objects | Aaron Patterson | 2012-11-15 | 1 | -3/+6 |
| | | | |||||
* | | | Assert the query result instead of checking for nothing raised | Carlos Antonio da Silva | 2012-11-13 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | Nothing should be raised anyway :smile: Thanks @spastorino :heart: https://github.com/rails/rails/pull/8202/files#r2112067 | ||||
* | | | Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_result | Carlos Antonio da Silva | 2012-11-13 | 2 | -0/+13 |
|\ \ \ | | | | | | | | | Regression test for #7238 | ||||
| * | | | Regression test for #7238 | Nikita Afanasenko | 2012-11-13 | 2 | -0/+13 |
| | | | | |||||
* | | | | Merge pull request #8176 from senny/7551_pluck_with_select | Rafael Mendonça França | 2012-11-13 | 3 | -2/+19 |
|\ \ \ \ | | | | | | | | | | | `#pluck` can be used on a relation with `select` clause (#7551) | ||||
| * | | | | `#pluck` can be used on a relation with `select` clause. | Yves Senn | 2012-11-12 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | Closes #7551 | ||||
| * | | | | cleanup, removed whitespace from CHANGELOG | Yves Senn | 2012-11-12 | 1 | -1/+1 |
| | | | | |