aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-131-1/+1
| | | | | | | It's safe to use `nil?` instead of `blank?` because it's impossible to get an array on finder with bang; `all_by` finder matches against regex without bang: `when /^find_(all_|last_)?by_([_a-zA-Z]\w*)$/`. Fixes #7238
* Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only ↵kennyj2012-11-141-6/+6
| | | | database.yml but also DATABASE_URL.
* Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-121-1/+9
| | | | | | | Remove unwanted transaction when has one association is built Conflicts: activerecord/CHANGELOG.md
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
| |
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| |
* | Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-11-091-0/+10
| | | | | | | | Public method attributes_before_type_cast used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like read_attribute_before_type_cast and returns unserialised values.
* | Merge pull request #7987 from ↵Santiago Pastorino2012-11-081-2/+2
|\ \ | | | | | | | | | | | | alexisbernard/3-2_find_in_batches_compatible_with_strings Fix find_in_batches with customized primary_key on 3-2-stable
| * | Fix find_in_batches against string IDs when start option is not specified.Alexis Bernard2012-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/batches.rb
| * | start could be a stringSantiago Pastorino2012-11-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62 Conflicts: activerecord/lib/active_record/relation/batches.rb activerecord/test/cases/batches_test.rb
* / Fix accepts_nested_attributes for child classesGabriel Sobrinho & Ricardo Henrique2012-11-071-3/+4
|/ | | | Closes GH-8131
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Ensure calling first/last with options correctly set inverse associationCarlos Antonio da Silva2012-11-011-1/+3
| | | | Also related to #8087. Thanks @al2o3cr.
* Fix issue with collection associations and first(n)/last(n)Carlos Antonio da Silva2012-11-011-1/+1
| | | | | | | | | | | | | | | | | When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094.
* Fix ActiveRecord#update_column return valuesaksmlz2012-10-311-1/+1
|
* Fix typo :bomb: [ci skip]Rafael Mendonça França2012-10-291-1/+1
|
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-291-2/+13
| | | | | | | | This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067.
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-292-35/+55
|\ | | | | | | fixed support for DATABASE_URL for rake db tasks
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-35/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport for #7521 - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified). - updated ResolverTest to use current_adapter? to check the type of the current adapter.
* | Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|/
* Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-291-1/+1
| | | | | | SQLite3Adapter#type_cast should not mutate arguments Conflicts: activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
* Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-291-1/+5
| | | | | | | | Unbreak update_column/update_columns for the primary key attribute. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb
* Make Active Record tests pass in isolationRafael Mendonça França2012-10-291-2/+1
| | | | Also remove the feature detecting for Ruby 1.9
* Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-281-0/+2
| | | | | | | Decode attributes pulled from URI.parse Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/connection_specification.rb
* frozen state should be restored after txn is abortedAaron Patterson2012-10-221-2/+3
|
* Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951Martin Grandrath2012-10-181-1/+1
| | | | | | | `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`. This patch lets the rake task retrieve the environment from `Rails.env` which defaults to "development".
* Merge pull request #7371 from csmuc/fix_dup_validation_errorsSantiago Pastorino2012-10-171-0/+1
| | | | | | | Dup'ed ActiveRecord objects may not share the errors object Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/dup_test.rb
* Synchronize around deleting from the reserved connections hash.Aaron Patterson2012-10-151-1/+1
| | | | Fixes #7955
* 7914 Using a better way to get the defaults from db.Arturo Pie2012-10-141-12/+7
| | | | | | | | | | | | | | | | Changes: * According to postgreSQL documentation: (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html) we should not be using 'adsrc' field because this field is unaware of outside changes that could affect the way that default values are represented. Thus, I changed the queries to use "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field. * Remove parsing of character type default values for 8.1 formatting since Rails doesn't support postgreSQL 8.1 anymore. * Remove misleading comment unrelated to code.
* #7914 get default value when type uses schema nameArturo Pie2012-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL adapter properly parses default values when using multiple schemas and domains. When using domains across schemas, PostgresSQL prefixes the type of the default value with the name of the schema where that type (or domain) is. For example, this query: ``` SELECT a.attname, d.adsrc FROM pg_attribute a LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum WHERE a.attrelid = "defaults"'::regclass AND a.attnum > 0 AND NOT a.attisdropped ORDER BY a.attnum; ``` could return something like "'<default_value>'::pg_catalog.text" or "(''<default_value>'::pg_catalog.text)::text" for the text columns with defaults. I modified the regexp used to parse this value so that it ignores anything between ':: and \b(?:character varying|bpchar|text), and it allows to have optional parens like in the above second example.
* Fix has_many assocation w/select load after createErnie Miller2012-10-121-1/+1
| | | | | | | | | | If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger a deprecation notice during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not.
* Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
| | | | | | Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications.
* Eager autoload ActiveRecord association helpersMichael Fairley2012-10-101-5/+7
|
* Merge pull request #7850 from ↵Rafael Mendonça França2012-10-061-1/+1
| | | | | | | | | senny/5920_postgres_adapter_table_with_capital_letters postgres, quote table names when fetching the primary key (#5920) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
* Merge pull request #6978 from frodsan/count_nosql_unsaved_parentRafael Mendonça França2012-10-041-0/+2
| | | | Count returns 0 without querying if parent is not saved
* RefactorSantiago Pastorino2012-10-031-5/+3
| | | | | Conflicts: activerecord/lib/active_record/counter_cache.rb
* Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-throughRafael Mendonça França2012-10-021-2/+8
| | | | | | | Fix reset_counters crashing on has_many :through associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb
* backport 68677ffb8298105eb9d3efa26d928dd88cc5e006Evan Petrie2012-09-282-6/+5
|
* ConnectionPool accepts spec key 'checkout_timeout'Jonathan Rochkind2012-09-241-3/+9
| | | | | | | Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported, but conflicts with mysql2 using that spec key for different thing. 'checkout_timeout' can now be used taking precedence for ConnectionPool over 'wait_timeout'.
* Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-212-4/+4
| | | | | | | | Rename field_changed? to _field_changed? so that users can create a field named field Conflicts: activerecord/lib/active_record/core.rb activerecord/test/cases/dirty_test.rb
* Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-201-190/+49
| | | | | | | | | | | | | This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d. Revert "Cache columns metadata to avoid extra while testing" This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216. Reason: This is causing failures in the postgresql build. See http://travis-ci.org/#!/rails/rails/builds/2485584 Related with #7675
* Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
| | | | | Conflicts: activerecord/lib/active_record/railties/databases.rake
* backport fair connection pool 02b2335563 to 3-2-stableJonathan Rochkind2012-09-171-49/+190
|
* Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-171-0/+14
| | | | Fix collection= on hm:t join models when unsaved
* Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-161-1/+1
| | | | | | | | | Don't preserve SELECT columns on COUNT Closes #7651 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* Backport explain fixes.Rafael Mendonça França2012-09-163-12/+13
| | | | | | | | * Mark as SCHEMA some schema database queries. #7648 * Don't explain queries except normal CRUD sql. #7657 Closes #6458 Closes #7544
* Backport PostgreSQL auto-reconnect test coverageSteve Jorgensen2012-09-131-0/+1
| | | | | | | | | | | | | | | | 6d5f4de4c420ebb906109668f5702a537ac77692 Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 4b1bca04025a66c54e6e9d5eb6e4d4056bfa92f0 Stop being silly with formatting of method aliasing. c381d5cbf959208adeb38e7859ee815dfbd2cf54 Fix just-plain-wrongness of psql auto-reconnect test. 1e17a9d367c54c680368be72f44247ae28b98904 Fix only-once stub logic. f16c2043826ec1991cf94fe17cb671507b7a7f51 Changelog for PostgreSQL auto-reconnect test coverage backport.
* Backported #7572 to 3-2-stable. Use config['encoding'], because database ↵kennyj2012-09-121-3/+3
| | | | configuration use not charset but encoding.
* Merge pull request #7582 from tchandy/fix_type_cast_codeRafael Mendonça França2012-09-091-2/+2
|\ | | | | type_cast_code should always convert values to integer calling #to_i
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:30:04 +0000