aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-02-182-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Typo fix for unscope Use the reference for the mime type to get the format Preparing for 4.1.0.beta2 release Correctly escape PostgreSQL arrays. Escape format, negative_format and units options of number helpers Sync 4.1 release notes with changes since 7f648bc7 [ci skip] Update upgrading guide regarding `render :text` Add `#no_content_type` attribute to `AD::Response` Add missing CHANGELOG entry to Action View Update guides for new rendering options Cleanup `ActionController::Rendering` Fix a fragile test on `action_view/render` Introduce `render :html` for render HTML string Introduce `render :plain` for render plain text Update hash format for render_text_test Introduce `render :body` for render raw content Don't use `# =>` when it is not the expression values Fix the column name [ci skip] Document the default scopes change on the release notes, CHANGELOG and upgrating guides Move changelog entry to the top, fix examples indent [ci skip] ...
| * Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-182-2/+6
| |\ | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| | * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| | |
| | * Correctly escape PostgreSQL arrays.Aaron Patterson2014-02-181-1/+5
| | | | | | | | | | | | | | | | | | Thanks Godfrey Chan for reporting this! Fixes: CVE-2014-0080
* | | cache queries in the Model.find(id) pathAaron Patterson2014-02-182-0/+28
| | |
* | | add AST cache to the find_by methodAaron Patterson2014-02-171-0/+35
| | |
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-173-12/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Revert "Merge pull request #13344 from ccutrer/fix-from-default-select" No need to use symbols Don't skip tests if they are not broken. Just don't define they Fix typo [ci skip] Resolve encoding issues with arrays of hstore (bug 11135). Fix coffeescript sample [ci skip]
| * | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3ea840355409dc205a9e0d027fc09f1452636969, reversing changes made to e4cde5d58cbb09d1843796f96ba86225ff94fe05. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb Reason: using `from` without `select` should not change the select list to SELECT * because it can lead different query results. If it is needed to change the table to a subquery or a view you can pass a table alias in the `from` call or use `select('subquery.*')`. Fixes #14049.
| * | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| | |
| * | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-172-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't have enough encoding for the wire protocol to store an array of hstore types. So, further encode any hstore that is an array member. Whilst we're here, ensure it's an HashWithIndifferentAccess being returned, to be consistent with other serialized forms, and add testing for arrays of hstore. So now the following migration: enable_extension "hstore" create_table :servers do |t| t.string :name t.hstore :interfaces, array: true end produces a model that can used like this, to store an array of hashes: server = Server.create(name: "server01", interfaces: [ { name: "bge0", ipv4: "192.0.2.2", state: "up" }, { name: "de0", state: "disabled", by: "misha" }, { name: "fe0", state: "up" }, ]) More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-1749-244/+626
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (311 commits) Add a missing changelog entry for #13981 and #14035 Revert "Fixed plugin_generator test" implements new option :month_format_string for date select helpers [Closes #13618] add factory methods for empty alias trackers guarantee a list in the alias tracker so we can remove a conditional stop exposing table_joins make most parameters to the AliasTracker required make a singleton for AssociationScope pass the association and connection to the scope method pass the tracker down the stack and construct it in the scope method clean up add_constraints signature remove the reflection delegate remove klass delegator remove railties changes. fixes #14054 remove chain delegate remove scope_chain delegate Add verb to sanitization note fix path shown in mailer's templates updated Travis build status image url fix guide active_support_core_extensions. add Note to String#indent [ci skip] ... Conflicts: activerecord/lib/active_record/associations/join_dependency.rb activerecord/test/cases/associations/association_scope_test.rb
| * | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we know the alias tracker is empty, we can create one that doesn't use a hash with default block for counting. ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.integer :comments_count end create_table :comments, force: true do |t| t.integer :post_id end end class Post < ActiveRecord::Base; has_many :comments; end class Comment < ActiveRecord::Base; belongs_to :post, counter_cache: true; end 10.times { Comment.create!(post: Post.create!) } record = Post.first association_name = :comments Benchmark.ips do |x| reflection = record.class.reflect_on_association(association_name) association = reflection.association_class.new(record, reflection) x.report('assoc') do reflection.association_class.new(record, reflection) end x.report('reader') do association.reader;nil end x.report('combined') do reflection.association_class.new(record, reflection).reader;nil end end [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0062s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 833 i/100ms reader 28703 i/100ms combined 839 i/100ms ------------------------------------------------- assoc 9010.3 (±3.8%) i/s - 44982 in 5.000022s reader 3214523.4 (±5.5%) i/s - 16016274 in 5.001136s combined 8841.0 (±5.8%) i/s - 44467 in 5.049269s [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0060s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 888 i/100ms reader 29217 i/100ms combined 900 i/100ms ------------------------------------------------- assoc 9674.3 (±3.3%) i/s - 48840 in 5.054022s reader 2988474.8 (±6.9%) i/s - 14842236 in 4.998230s combined 9674.0 (±3.1%) i/s - 48600 in 5.028694s
| * | guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
| | |
| * | stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| | |
| * | make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| | | | | | | | | | | | | | | This helps with our sanity. The class is internal, we can refactor to a "nice" API later.
| * | make a singleton for AssociationScopeAaron Patterson2014-02-142-1/+7
| | | | | | | | | | | | | | | AssociationScope no longer maintains state, so we're safe to keep a singleton and save on GC time
| * | pass the association and connection to the scope methodAaron Patterson2014-02-142-9/+3
| | |
| * | pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| | |
| * | clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| | |
| * | remove the reflection delegateAaron Patterson2014-02-141-15/+14
| | |
| * | remove klass delegatorAaron Patterson2014-02-141-10/+11
| | |
| * | remove chain delegateAaron Patterson2014-02-141-5/+6
| | |
| * | remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| | |
| * | Merge pull request #14048 from pcreux/better-error-message-db-migrate-downCarlos Antonio da Silva2014-02-141-1/+1
| |\ \ | | | | | | | | Add hint to error message of task db:migrate:down
| | * | Add hint to error message of task db:migrate:downPhilippe Creux2014-02-131-1/+1
| | | |
| * | | remove more delegate methodsAaron Patterson2014-02-131-7/+9
| | | |
| * | | :scissors: whitespaceAaron Patterson2014-02-131-1/+0
| | | |
| * | | rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
| | | |
| * | | JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-133-42/+25
| | | |
| * | | speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
| | | |
| * | | Merge pull request #14034 from ↵Yves Senn2014-02-131-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | hdabrows/drop-correct-index-when-reverting-migration Drop the correct index after reverting a migration
| | * | | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when reverting a migration which added a named index it would instead drop a corresponding index with matching columns but without a name.
| * | | | Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
| | | | |
| * | | | `execute` is a hotspot, so let's reduce branchesAaron Patterson2014-02-121-6/+2
| |/ / /
| * | | adding missed changekayvan2014-02-111-1/+1
| | | |
| * | | adding connection parameter to check_pending for migrationskayvan2014-02-111-5/+5
| | | |
| * | | Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
| | | |
| * | | move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
| | | |
| * | | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-083-2/+13
| |\ \ \ | | | | | | | | | | Reaper has access to threadsafe active? call
| | * | | Reaper has access to threadsafe active? callKevin Casey2014-02-083-2/+13
| | | | |
| * | | | context in validation goes through has many relationshipKevin Casey2014-02-081-1/+1
| |/ / /
| * | | Merge branch 'dump-schema-after-migration-flag' of ↵Xavier Noria2014-02-062-1/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md
| | * | | Add config to disable schema dump after migrationEmil Soman2014-02-062-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG
| * | | | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-052-2/+4
| | | | |
| * | | | Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-051-4/+9
| | | | |
| * | | | docs, AR already auto-detects primary keys. Closes #13946. [ci skip]Yves Senn2014-02-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This behavior was introduced since Rails 3.1 (207f266ccaaa9cd04cd2a7513ae5598c4358b510) but the docs were still out of date.
| * | | | Document that enum conditions must use the ordinal valueRafael Mendonça França2014-02-041-0/+2
| |/ / / | | | | | | | | | | | | [ci skip]
| * | | Merge pull request #13935 from arthurnn/fix_12566Rafael Mendonça França2014-02-041-1/+1
| |\ \ \ | | | | | | | | | | Make sure transaction state resets after commit
| | * | | Make sure transaction state resets after commitArthur Neves2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | [fixes #12566]
| * | | | Merge pull request #13899 from ↵Rafael Mendonça França2014-02-041-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Fortisque/kevin/active_record_HABTM_with_belongs_to destruction errors out on HABTM w/out primary key
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-27 19:51:31 +0000