aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Synchronize around deleting from the reserved connections hash.Aaron Patterson2012-10-152-1/+4
| | | | Fixes #7955
* Merge pull request #7940 from arturopie/7914-backport-to-3-2-stableRafael Mendonça França2012-10-144-14/+61
|\ | | | | Backport fix of issue #7914 to 3-2-stable
| * 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-144-2/+54
|/ | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #7925 from ernie/3-2-fix-collection-associations-with-selectRafael Mendonça França2012-10-123-1/+15
|\ | | | | Fix has_many assocation w/select load after create
| * Fix has_many assocation w/select load after createErnie Miller2012-10-123-1/+15
|/ | | | | | | | | | 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.
* Merge pull request #7905 from jfirebaugh/eager_autoload_3-2Rafael Mendonça França2012-10-102-15/+21
|\ | | | | Backport eager autoloading fixes
| * 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
|/
* Backport 1a7049906ee6735bae058e9985a3806d08d9746bJeremy Kemper2012-10-061-3/+6
| | | | | | | | | | | | | Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\ | | | | Accept :remote as symbol in link_to options (backport)
| * Accept :remote as symbol in link_to optionsRiley2012-10-063-1/+12
| | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* | Use the Ruby 1.8 hash syntaxRafael Mendonça França2012-10-061-1/+1
|/
* Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-3/+23
| | | | | | can't pass :locals to #assert_template without a view test case (#3415) Conflicts: actionpack/CHANGELOG.md
* Merge pull request #7850 from ↵Rafael Mendonça França2012-10-063-5/+14
| | | | | | | | | 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-045-0/+37
| | | | Count returns 0 without querying if parent is not saved
* Merge pull request #7836 from lihanli/error-msg-updateRafael Mendonça França2012-10-032-2/+6
|\ | | | | Update supported ruby versions error message in ruby_version_check.rb
| * Update supported ruby versions error message in ruby_version_check.rblihan2012-10-032-2/+6
|/
* 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-025-4/+29
| | | | | | | Fix reset_counters crashing on has_many :through associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
| | | | | | | | | prefix TemplateAssertions ivars. Closes #7459 Conflicts: actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/test_case.rb
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
| | | | resource and resources do no longer modify passed options
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-013-7/+116
| | | | | | | | Master branch: Fixed generated whitespace in routes when using namespaced resource. Merge pull request #7811 from iHiD/resource_generator_routes_master Fix the build (Broken scaffold routes test)
* Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-303-5/+4
| | | | behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. ↵Jeremy Kemper2012-09-304-22/+43
| | | | Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
* Merge pull request #7802 from steveklabnik/issue_7799Xavier Noria2012-09-301-1/+1
|\ | | | | Fix reference to code sample in Getting Started.
| * Fix reference to code sample in Getting Started.Steve Klabnik2012-09-301-1/+1
|/ | | | Fixes #7799.
* New CHANGELOG entries always in the top [ci skip]Rafael Mendonça França2012-09-301-6/+6
|
* Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-304-6/+55
| | | | | | | REBASED: fixing assert_template bug when template matches expected, but not ends with Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/test_case.rb
* Merge pull request #7786 from yabawock/3-2-stableRafael Mendonça França2012-09-293-1/+14
|\ | | | | Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
| * Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-09-293-1/+14
| | | | | | | | | | | | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* | Merge pull request #7785 from okcwest/3-2-stableAaron Patterson2012-09-284-6/+13
|\ \ | |/ |/| backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
| * backport 68677ffb8298105eb9d3efa26d928dd88cc5e006Evan Petrie2012-09-284-6/+13
| |
* | Hashrocket for 1.8 supportJeremy Kemper2012-09-281-2/+2
| |
* | Shush uninitialized @_layout warningJeremy Kemper2012-09-281-1/+1
|/
* Shush syntax warningsJeremy Kemper2012-09-281-3/+3
|
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-272-20/+29
| | | | | | | logs. Conflicts: railties/test/application/rack/logger_test.rb
* Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-273-18/+69
| | | | | | | | | Avoid memory leak from unflushed logs on other threads leaving tags behind. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/tagged_logging.rb activesupport/test/tagged_logging_test.rb
* Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵Jeremy Kemper2012-09-271-1/+2
| | | | the same line
* Only apply log tags if the logger supports itJeremy Kemper2012-09-271-1/+1
|
* Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backportRafael Mendonça França2012-09-254-5/+39
|\ | | | | ConnectionPool accepts spec key 'checkout_timeout' (Backport)
| * ConnectionPool accepts spec key 'checkout_timeout'Jonathan Rochkind2012-09-244-5/+39
| | | | | | | | | | | | | | 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'.
* | Fix invalid ruby 1.8 syntaxRafael Mendonça França2012-09-211-4/+5
|/
* Merge pull request #7723 from steveklabnik/backport_3554Rafael Mendonça França2012-09-214-5/+23
|\ | | | | Backport #3544 to 3-2-stable
| * Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-214-5/+23
|/ | | | | | | | 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 "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
| | | | | | This reverts commit 54f55746a70a7091341e84236498203118a7fbb4. Reason: the last commit fixed the failing case
* Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
|
* Revert "Respect `config.digest = false` for `asset_path`"Rafael Mendonça França2012-09-203-20/+1
| | | | | | | | | | | | This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70. Conflicts: actionpack/CHANGELOG.md Reason: This is causing failures in the railties build. See http://travis-ci.org/#!/rails/rails/jobs/2491787 Related with #7672
* Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-207-311/+51
| | | | | | | | | | | | | 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
* Merge pull request #7718 from kennyj/fix_6962-32Rafael Mendonça França2012-09-203-1/+16
|\ | | | | [3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 16:18:42 +0000