aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10884 from dmarkow/pg_fix_default_quotesYves Senn2013-06-191-1/+1
|\ | | | | Handle single quotes in PostgreSQL default column values
| * Handle single quotes in PostgreSQL default column valuesDylan Markow2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | PostgreSQL escapes single quotes by using an additional single quote. When Rails queries the column information, PostgreSQL returns the default values with the escaped single quotes. #extract_value_from_default now converts these to one single quote each. Fixes #10881.
* | Revert "Merge pull request #10566 from neerajdotname/10509d"Jon Leighton2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16, reversing changes made to 353a398bee68c5ea99d76ac7601de0a5fef6f4a5. Conflicts: activerecord/CHANGELOG.md Reason: the build broke
* | log the sql that is actually sent to the databaseNeeraj Singh2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If I have a query that produces sql `WHERE "users"."name" = 'a b'` then in the log all the whitespace is being squeezed. So the sql that is printed in the log is `WHERE "users"."name" = 'a b'`. This can be confusing. This commit fixes it by ensuring that whitespace is not squeezed. fixes #10982
* | do not load all child records for inverse caseNeeraj Singh2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | currently `post.comments.find(Comment.first.id)` would load all comments for the given post to set the inverse association. This has a huge performance penalty. Because if post has 100k records and all these 100k records would be loaded in memory even though the comment id was supplied. Fix is to use in-memory records only if loaded? is true. Otherwise load the records using full sql. Fixes #10509
* | Merge pull request #10987 from senny/10979_association_include_returns_trueXavier Noria2013-06-181-1/+1
|\ \ | | | | | | `CollectionProxy#include?` returns `true` and `false` as documented.
| * | `CollectionProxy#include?` returns `true` and `false` as documented.Yves Senn2013-06-181-1/+1
| | |
* | | Merge branch 'master' into mrbrdo-fixserializationAaron Patterson2013-06-1725-266/+365
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (142 commits) Use Colspan in th Tags Added test for link_to_unless to make sure the result consistency. Escape the string even when the condition of link_to_unless is not satisfied. Add CHANGELOG entry for #10969 Use a case insensitive URI Regexp for #asset_path collection tags accept html attributes as the last element of collection Rewind StringIO instances before be parsed again Use xml instead already parsed xml Updated the doc for const_regexp [ci skip] Make test name descriptive and add reference to original regression commit fixture setup does not rely on `AR::Base.configurations`. regression test + mysql2 adapter raises correct error if conn is closed. cleanup, remove trailing whitespace from AR changelog 'json' gem is no more required under JRuby fix typos Fix AS changelog [ci skip] Update the HTML boolean attributes per the HTML 5.1 spec Changing const_regexp to check for constant name. valid_app_const? -> valid_const? Add CHANGELOG entry for #10740 ...
| * \ \ Merge pull request #10942 from yangchenyun/mineYves Senn2013-06-161-2/+2
| |\ \ \ | | |/ / | |/| | correct documentation about active_record.default_timezone
| | * | correct documentation about active_record behaviorSteven Yang2013-06-151-2/+2
| | | |
| * | | fixture setup does not rely on `AR::Base.configurations`.Yves Senn2013-06-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As you can also configure your database connection using `ENV["DATABASE_URL"]`, the fixture setup can't reply on the `.configurations` Hash. As the fixtures are only loaded when ActiveRecord is actually used (`rails/test_help.rb`) it should be safe to drop the check for an existing configuration.
| * | | regression test + mysql2 adapter raises correct error if conn is closed.Yves Senn2013-06-151-3/+5
| | | |
| * | | Merge pull request #10898 from dmitry/find_first_refactor_duplicationRafael Mendonça França2013-06-141-11/+10
| |\ \ \ | | | | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication.
| | * | | rename method `find_first_records` to `find_first_with_limit`Dmitry Polushkin2013-06-101-3/+3
| | | | |
| | * | | Refactored ActiveRecord `first` method to get rid of duplication.Dmitry Polushkin2013-06-091-11/+10
| | | | |
| * | | | Properly namespace DatabaseTasksPiotr Sarnacki2013-06-141-1/+1
| | | | |
| * | | | Use DatabaseTasks.env instead of Rails.env in databases.rakePiotr Sarnacki2013-06-141-1/+1
| | |/ / | |/| |
| * | | quoted table name is also cachedAaron Patterson2013-06-131-1/+1
| | | |
| * | | table name is cached on the class, so stop caching twiceAaron Patterson2013-06-131-1/+1
| | | |
| * | | calculate types on constructionAaron Patterson2013-06-131-8/+4
| | | |
| * | | only cache the primary key column in one placeAaron Patterson2013-06-131-1/+1
| | | |
| * | | these methods are never called, so remove themAaron Patterson2013-06-131-8/+0
| | | |
| * | | This test does not test anything that happens in the real world. If youAaron Patterson2013-06-131-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreate the models without mucking with internal caches of the relation objects, then the test fails. For example: class Man < ActiveRecord::Base has_many :interests end class Interest < ActiveRecord::Base belongs_to :man end Then do this test: def test_validate_presence_of_parent_fails_without_inverse_of repair_validations(Interest) do Interest.validates_presence_of(:man) assert_no_difference ['Man.count', 'Interest.count'] do man = Man.create(:name => 'John', :interests_attributes => [{:topic=>'Cars'}, {:topic=>'Sports'}]) assert_not_predicate man.errors[:"interests.man"], :empty? end end end The test will fail. This is a bad test, so I am removing it.
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-145-29/+94
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md
| | * | | copy edits [ci skip]Vijay Dev2013-06-141-19/+15
| | | | |
| | * | | doc: renaming table name to follow the file's standardsThiago Pinto2013-06-081-2/+2
| | | | |
| | * | | instructions for variations and alternatives for ActiveRecord#findThiago Pinto2013-06-081-1/+35
| | | | |
| | * | | explaining ActiveRecord#first in rails 3 and 4Thiago Pinto2013-06-081-0/+13
| | | | |
| | * | | lists the options for find_each and find_in_batchesThiago Pinto2013-06-071-17/+37
| | | | |
| | * | | using Model.all.find_each in rails 3 raises an error and should not be ↵Thiago Pinto2013-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | recommended
| | * | | minor comments cleanupNeeraj Singh2013-05-271-3/+4
| | | | |
| | * | | enhanced comments for foreign_key_present? methodNeeraj Singh2013-05-231-3/+4
| | | | |
| | * | | update_counters accepts a hash, not an array of hashesMichael Kozono2013-05-211-1/+1
| | | | |
| * | | | oops. step away from the keyboard aaron. :cry:Aaron Patterson2013-06-131-1/+1
| | | | |
| * | | | fix caching of automatic inverse of. :bomb:Aaron Patterson2013-06-131-1/+3
| | | | |
| * | | | let the object stay in charge of internal cache invalidationAaron Patterson2013-06-132-13/+6
| | | | |
| * | | | reduce automatic_inverse_of caching logicAaron Patterson2013-06-131-30/+16
| | | | |
| * | | | active_record should always be set. Do or do not, there is no tryAaron Patterson2013-06-131-1/+1
| | | | |
| * | | | push ambiguous reflection warning down to reflection name calculationAaron Patterson2013-06-131-23/+28
| | | | |
| * | | | clean up ivar assignmentAaron Patterson2013-06-131-3/+2
| | | | |
| * | | | Ambiguous reflections are on :through relationships are no longer supported.Aaron Patterson2013-06-131-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, you need to change this: class Author < ActiveRecord::Base has_many :posts has_many :taggings, :through => :posts end class Post < ActiveRecord::Base has_one :tagging has_many :taggings end class Tagging < ActiveRecord::Base end To this: class Author < ActiveRecord::Base has_many :posts has_many :taggings, :through => :posts, :source => :tagging end class Post < ActiveRecord::Base has_one :tagging has_many :taggings end class Tagging < ActiveRecord::Base end
| * | | | Merge pull request #10425 from ↵Rafael Mendonça França2013-06-134-38/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ranjaykrishna/push_add_column_options_to_schema_creation Push add column options to schema creation
| | * | | | Moving add_column_options! up to SchemaCreationjeran2013-06-124-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed two instances of add_column_options! from abstract_mysql_adapter reworked rename_column_sql to remove add_column_options from schema_statements changed to use new hash syntax.
| * | | | | sometimes singularize does not work, so we get a list of two strings. just ↵Aaron Patterson2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | uniq them
| * | | | | no need to cache hash lookupsAaron Patterson2013-06-121-1/+1
| | | | | |
| * | | | | split aggregates from association reflections to avoid is_a checks laterAaron Patterson2013-06-121-5/+11
| | | | | |
| * | | | | remove unnecessary is_a checkAaron Patterson2013-06-121-2/+1
| | | | | |
| * | | | | we should apply the default scope before queryingAaron Patterson2013-06-121-1/+2
| | | | | |
| * | | | | bind values should not be merged between scopesAaron Patterson2013-06-111-1/+1
| | | | | |
| * | | | | stop adding a new method for touch callbacksAaron Patterson2013-06-111-29/+21
| | | | | |