aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allowing pass couple extension to register_template_handler callTima Maslyuchenko2012-09-173-3/+17
|
* Use the CHANGELOG convention [ci skip]Rafael Mendonça França2012-09-171-3/+5
|
* Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-173-0/+24
|\ | | | | Fix collection= on hm:t join models when unsaved
| * Fix collection= on hm:t join models when unsavedErnie Miller2012-09-173-0/+24
| | | | | | | | | | | | If assigning to a has_many :through collection against an unsaved object using the collection=[<array_of_items>] syntax, the join models were not properly created, previously.
* | Merge pull request #7595 from guilleiguaran/update-ap-changelogRafael Mendonça França2012-09-171-0/+13
|\ \ | | | | | | Add missing entry in CHANGELOG about change of AD::Session::MemCacheStore
| * | Add missing entries in AP changelogGuillermo Iguaran2012-09-161-0/+13
| | |
* | | Merge pull request #7667 from kennyj/fix_unnecessary_code_20120917Rafael Mendonça França2012-09-171-1/+0
|\ \ \ | | | | | | | | Remove unncessary code.
| * | | Remove unncessary code.kennyj2012-09-171-1/+0
| | | |
* | | | Merge pull request #7664 from arunagw/build_fix_railtiesRafael Mendonça França2012-09-171-1/+1
|\ \ \ \ | | | | | | | | | | Fix build for Queue.
| * | | | Fix build for Queue.Arun Agrawal2012-09-171-1/+1
| |/ / /
* | | | Merge pull request #7666 from ↵Rafael Mendonça França2012-09-171-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665 Fix warning: method redefine. Testcase name are duplicated.
| * | | Fix warning: method redefine. Testcase name are duplicated.kennyj2012-09-171-1/+1
|/ / /
* | | Use synchronous queue by default. Separate queued message delivery jobs from ↵Jeremy Kemper2012-09-165-27/+30
| | | | | | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
* | | Always run jobs using a consumer, even in synchronous & test queues, to ↵Jeremy Kemper2012-09-164-69/+108
|/ / | | | | | | ensure shared behavior.
* | Merge pull request #7662 from frodsan/ar_changelogRafael Mendonça França2012-09-161-44/+68
|\ \ | | | | | | improve AR/CHANGELOG [ci skip]
| * | improve AR/CHANGELOG [ci skip]Francesco Rodriguez2012-09-161-44/+68
|/ /
* | Merge pull request #7547 from danmcclain/pg-arraysRafael Mendonça França2012-09-1612-53/+435
|\ \ | | | | | | Adds migration and type casting support for PostgreSQL Array datatype
| * | Moves column dump specific code to a module included in AbstractAdapterDan McClain2012-09-1412-53/+435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having column related schema dumper code in the AbstractAdapter. The code remains the same, but by placing it in the AbstractAdapter, we can then overwrite it with Adapter specific methods that will help with Adapter specific data types. The goal of moving this code here is to create a new migration key for PostgreSQL's array type. Since any datatype can be an array, the goal is to have ':array => true' as a migration option, turning the datatype into an array. I've implemented this in postgres_ext, the syntax is shown here: https://github.com/dockyard/postgres_ext#arrays Adds array migration support Adds array_test.rb outlining the test cases for array data type Adds pg_array_parser to Gemfile for testing Adds pg_array_parser to postgresql_adapter (unused in this commit) Adds schema dump support for arrays Adds postgres array type casting support Updates changelog, adds note for inet and cidr support, which I forgot to add before Removing debugger, Adds pg_array_parser to JRuby platform Removes pg_array_parser requirement, creates ArrayParser module used by PostgreSQLAdapter
* | | Remove debug code :bomb:Rafael Mendonça França2012-09-161-1/+0
| | |
* | | Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-162-2/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | Don't preserve SELECT columns on COUNT Closes #7651
| * | | Don't preserve SELECT columns on COUNTSteve Klabnik2012-09-162-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The COUNT clause of a finder_sql relationship is being rewritten from COUNT(*) to COUNT(table_name.*). This does not appear to be valid syntax in MySQL: ``` mysql> SELECT COUNT( table_name.* ) FROM `table_name`; ERROR 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* ) FROM `table_name`' at line 1 ``` This fixes the bug, as well as adding tests so we don't re-introduce it in the future. Fixes #3956.
* | | | Merge pull request #7645 from larrylv/configurable-defaultsRafael Mendonça França2012-09-163-8/+45
|\ \ \ \ | |_|_|/ |/| | | Set up config_accessor with a default value by block
| * | | set up config_accessor with a default value by blockLarry Lv2012-09-173-8/+45
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ActiveSupport::Configurable should allow config_accessor to take default value by block, just like cattr_accessor. class User include ActiveSupport::Configurable config_accessor :hair_colors do [:brown, :black, :blonde, :red] end end User.hair_colors # => [:brown, :black, :blonde, :red] * remove trailing whitespaces in configurable.rb and its test file. * Update ActiveSupport CHANGELOG.
* | | Merge pull request #7657 from kennyj/fix_6458-2Piotr Sarnacki2012-09-163-1/+14
|\ \ \ | | | | | | | | Don't explain except normal CRUD sql.
| * | | Don't explain except normal CRUD sql.kennyj2012-09-173-1/+14
| | | |
* | | | Merge pull request #7652 from toshi-kawanishi/find_in_batchesCarlos Antonio da Silva2012-09-164-6/+38
|\| | | | | | | | | | | Fix find_in_batches with customized primary_key
| * | | Fix find_in_batches with customized primary_keyToshiyuki Kawanishi2012-09-164-6/+38
|/ / /
* | | Merge pull request #7648 from kennyj/rename_2_schemaRafael Mendonça França2012-09-152-5/+5
|\ \ \ | | | | | | | | Query for loading index info should be marked as SCHEMA.
| * | | Query for sequence info also should be markd as SCHEMA.kennyj2012-09-151-3/+3
| | | |
| * | | Query for loading index info should be marked as SCHEMA.kennyj2012-09-152-2/+2
| | | |
* | | | Merge pull request #7656 from czarneckid/clarify-documentationXavier Noria2012-09-151-2/+2
|\ \ \ \ | | | | | | | | | | Clarify the documentation on the Rails::Application#call method
| * | | | Clarify the documentation on the Rails::Application#call methodDavid Czarnecki2012-09-151-2/+2
|/ / / /
* | | | Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
| | | | | | | | | | | | | | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981
* | | | Merge pull request #7655 from steveklabnik/masterRafael Mendonça França2012-09-151-0/+1
|\ \ \ \ | |/ / / |/| | | fix the build
| * | | fix the buildSteve Klabnik2012-09-151-0/+1
|/ / /
* | | Merge pull request #7643 from steveklabnik/deprecate_silenceRafael Mendonça França2012-09-153-12/+23
|\ \ \ | | | | | | | | Deprecate ActiveSupport::Benchmarkable#silence.
| * | | Deprecate ActiveSupport::Benchmarkable#silence.Steve Klabnik2012-09-153-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to its lack of thread safety, we're deprecating this, and it will be removed in Rails 4.1. Fixes #4060.
* | | | Merge pull request #7654 from steveklabnik/issue_4857Xavier Noria2012-09-151-0/+8
|\ \ \ \ | | | | | | | | | | Improve Process::Status#to_json
| * | | | Improve Process::Status#to_jsonSteve Klabnik2012-09-151-0/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Process::Status has no instance_variables, the ActiveSupport version of #to_json produces {}, which isn't good. Therefore, we implement our own #as_json, which makes it useful again. Fixes #4857
* | | | Merge pull request #7649 from steveklabnik/issue_2520Rafael Mendonça França2012-09-153-1/+48
|\ \ \ \ | | | | | | | | | | Support for multiple etags in an If-None-Match header
| * | | | Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-153-1/+48
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb
* | | | Fix syntax error in assert_matchRafael Mendonça França2012-09-151-6/+6
| | | |
* | | | Merge pull request #7653 from arunagw/warnings-removedRafael Mendonça França2012-09-151-3/+3
|\ \ \ \ | | | | | | | | | | Few more warnings removed.
| * | | | Few more warnings removed.Arun Agrawal2012-09-152-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | I found them when I was running warning mode on with railties See https://github.com/rails/rails/pull/3782
* / / / simplify rescueJon Leighton2012-09-151-3/+3
|/ / /
* | | Fix testJon Leighton2012-09-152-15/+21
| | | | | | | | | | | | Accidentally checked in commented test code. Fail. >_<
* | | Ensure disconnecting or reconnecting resets the transaction stateJon Leighton2012-09-157-9/+55
| | |
* | | Remove our use of #outside_transaction?Jon Leighton2012-09-153-61/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was first seen in 045713ee240fff815edb5962b25d668512649478, and subsequently reimplemented in fb2325e35855d62abd2c76ce03feaa3ca7992e4f. According to @jeremy, this is okay to remove. He thinks it was added because at the time we didn't have much transaction state to keep track of, and he viewed it as a hack for us to track it internally, thinking it was better to ask the connection for the transaction state. Over the years we have added more and more state to track, a lot of which is impossible to ask the connection for. So it seems that this is just a relic of the passed and we will just track the state internally only.
* | | Remove the transaction_open variableJon Leighton2012-09-152-21/+33
| | |
* | | Move transaction joinability into the transaction objectJon Leighton2012-09-155-20/+36
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 01:13:06 +0000