aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge remote-tracking branch ↵Jon Leighton2014-02-251-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'chancancode/fix_instance_method_already_implemented' Conflicts: activerecord/CHANGELOG.md
| * | | | | Fixed STI classes not defining an attribute method if there is aGodfrey Chan2014-02-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicting private method defined on its ancestors. The problem is that `method_defined_within?(name, klass, superklass)` only works correclty when `klass` and `superklass` are both `Class`es. If both `klass` and `superklass` are both `Class`es, they share the same inheritance chain, so if a method is defined on `klass` but not `superklass`, this method must be introduced at some point between `klass` and `superklass`. This does not work when `superklass` is a `Module`. A `Module`'s inheritance chain contains just itself. So if a method is defined on `klass` but not on `superklass`, the method could still be defined somewhere upstream, e.g. in `Object`. This fix works by avoiding calling `method_defined_within?` with a module while still fufilling the requirement (checking that the method is defined withing `superclass` but not is not a generated attribute method). 4d8ee288 is likely an attempted partial fix for this problem. This unrolls that fix and properly check the `superclass` as intended. Fixes #11569.
* | | | | | Merge pull request #14152 from ↵Aaron Patterson2014-02-251-9/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/fix-ar-wtf-why-is-there-no-environment Handle missing environment from non empty config
| * | | | | | Handle missing environment from non empty configschneems2014-02-211-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using a `DATABASE_URL` and a `database.yml`. The connection information in `DATABASE_URL` should be merged into whatever environment we are in. As released in 4.1.0rc1 if someone has a database.yml but is missing a key like production: ```yml development: host: localhost ``` Then the check for blank config will return false so the information from the `DATABASE_URL` will not be used when attempting to connect to the `production` database and the connection will incorrectly fail. This commit fixes this problem and adds a test for the behavior. In addition the ability to specify a connection url in a `database.yml` like this: ``` production: postgres://localhost/foo ``` Was introduced in 4.1.0rc1 though should not be used, instead using a url sub key ``` production: url: postgres://localhost/foo ``` This url sub key was also introduced in 4.1.0rc1 though the `production: postgres://localhost/foo` was not removed. As a result we should not test this behavior.
* | | | | | | Add missing parantheses in index_exists?Yannick Schutz2014-02-251-1/+1
| | | | | | |
* | | | | | | Coerce strings when reading attributes.Yves Senn2014-02-232-7/+21
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #13793 from senny/postgres/dynamic_range_oidYves Senn2014-02-232-40/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dynamically define PostgreSQL Range OIDs
| * | | | | | deprecate support for pg ranges with excluding beginnings.Yves Senn2014-02-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ruby Range object does not support excluding beginnings. We currently support excluding beginnings for some subtypes using manually by incrementing them (now using the `#succ` method). This is approach is flawed as it's not equal to an excluding beginning. This commit deprecates the current support for excluding beginnings. It also raises an `ArgumentError` for subtypes that do not implement the `succ` method. This is a temporary solution to get rid of the broken state. We might still add complete support for excluding beginnings afterwards. (Probably with a new `PGRange` object, which acts like a `Range` but has excluding beginnings.
| * | | | | | dynamically define PostgreSQL OID range types.Yves Senn2014-02-232-41/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets AR working with custom defined range types. It also removes the need for subtype specific branches in `OID::Range`. This expands the interface of all `OID` types with the `infinity` method. It's responsible to provide a value for positive and negative infinity.
* | | | | | | update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #14164 from vajrasky/fix_typo_max_idGuillermo Iguaran2014-02-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed typo in comment about MAX_ID.
| * | | | | | Fixed typo in comment about MAX_ID.Vajrasky Kok2014-02-231-1/+1
| | | | | | |
* | | | | | | Distinguish ConnectionNotEstablished messages: no conn pool for the class, ↵Jeremy Kemper2014-02-221-1/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | or no conn available from the pool
* | | | | | Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
| | | | | |
* | | | | | Revert "context in validation goes through has many relationship"Aaron Patterson2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48.
* | | | | | Revert "speed up the collection proxy reader method, but slow down the ↵Arthur Neves2014-02-201-5/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116]
* | | | | 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
* | | | | | 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/
* | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 22:18:54 +0000