aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ActiveRecord support to PostgreSQL 9.2 JSON typeDickson S. Guedes2012-09-059-4/+135
| | | | | | | | | This implements the support to encode/decode JSON data to/from database and creating columns of type JSON using a native type [1] supported by PostgreSQL from version 9.2. [1] http://www.postgresql.org/docs/9.2/static/datatype-json.html
* Add CHANGELOG entry for #7532 [ci skip]Rafael Mendonça França2012-09-051-0/+10
|
* Merge pull request #7532 from al2o3cr/fix_store_bugsRafael Mendonça França2012-09-053-4/+12
|\ | | | | correct handling of changes in AR::Store, combine multiple store_accessors
| * correctly flag changed attributes in AR::Store, combine multiple calls to ↵Matt Jones2012-09-053-4/+12
| | | | | | | | store_accessor
* | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_wordsRafael Mendonça França2012-09-055-3/+21
|\ \ | | | | | | Fix pluck when columns/tables are reserved words.
| * | Fix pluck when columns/tables are reserved words.Ian Lesperance2012-09-055-3/+21
| | |
* | | Merge pull request #7525 from ↵Rafael Mendonça França2012-09-052-9/+10
|\ \ \ | |/ / |/| | | | | | | | seamusabshere/use-mysql-binary-for-rake-db-structure-load Use the 'mysql' binary for 'rake db:structure:load'
| * | Use the 'mysql' binary for 'rake db:structure:load'.Seamus Abshere2012-09-052-9/+10
| | | | | | | | | | | | The previous implementation had the strange requirement that db/structure.sql contain only CREATE TABLE sql statements, one per table, separated by double newlines. SQLite3 and PostgreSQL database tasks, on the other hand, simply spawn 'sqlite3' and 'psql' binaries to load the file directly. The new implementation follows this and attempts to respect all current MySQL configuration settings.
* | | Define just the cattr_reader.Rafael Mendonça França2012-09-051-1/+2
| | | | | | | | | | | | | | | This will trim down the API and avoid some error that can be made changing the cache object.
* | | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-052-16/+22
| | |
* | | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
| | | | | | | | | | | | | | | We should not require all the core extensions inside the frameworks. The logger is already defined in the Action View framework.
* | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
|\ \ \ | | | | | | | | Fix for time type columns with invalid time value
| * | | Update changelog with time column type casting fixAdam Meehan2012-09-051-0/+4
| | | |
| * | | Fix for time type columns with invalid timeAdam Meehan2012-09-052-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | The string_to_dummy_time method was blindly parsing the dummy time string with Date._parse which returns a hash for the date part regardless of whether the time part is an invalid time string.
* | | | Merge pull request #7447 from etehtsea/postgresql-adapterRafael Mendonça França2012-09-057-988/+1038
|\ \ \ \ | |/ / / |/| | | Modularize postgresql adapter
| * | | Modularize postgresql adapterKonstantin Shabanov2012-09-057-988/+1038
| | | |
* | | | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix a typo in AD
| * | | | Fix a typoRobin Dupret2012-09-051-1/+1
| | | | |
* | | | | Merge pull request #7519 from leocassarani/merge-with-blockRafael Mendonça França2012-09-043-6/+50
|\ \ \ \ \ | | | | | | | | | | | | Add an optional block to HashWithIndifferentAccess#update and #merge
| * | | | | Extend HashWithIndifferentAccess#update to take an optional blockLeo Cassarani2012-09-053-6/+50
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a block is passed into the method, it will be invoked for each duplicated key, with the key in question and the two values as arguments. The value for the duplicated key in the receiver will be set to the return value of the block. This behaviour matches Ruby's long-standing implementation of Hash#update and is intended to provide a more consistent interface. HashWithIndifferentAccess#merge is also affected by the change, as it uses #update internally.
* | | | | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-042-85/+94
|\ \ \ \ \ | |_|_|/ / |/| | | | Refactor `Mime::Type`
| * | | | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `parse` method performance improvements - ~27-33%: accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, , pronto/1.00.00, sslvpn/1.00.00.00, */*" Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }} old: 1.430000 0.000000 1.430000 ( 1.440977) new: 0.920000 0.000000 0.920000 ( 0.921813)
* | | | | We dont need to include the name and the format in the digest -- source is ↵David Heinemeier Hansson2012-09-041-1/+1
| |_|_|/ |/| | | | | | | | | | | authoritative enough
* | | | Merge pull request #7422 from ernie/improvements-to-improved-routingDavid Heinemeier Hansson2012-09-043-14/+103
|\ \ \ \ | | | | | | | | | | Allow routing concerns to accept a callable
| * | | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70
| | | | |
| * | | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
| | | | | | | | | | | | | | | | | | | | Also, add documentation for alternate usage.
| * | | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to make alterations to the generated routes based on the scope of the current mapper, and otherwise allows us to move larger blocks of concerns out of the routes file, altogether.
* | | | | revised the exception message "Expected #{file_path} to define ↵Xavier Noria2012-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #{qualified_name}" Users need to know the ultimate problem here is that AS was trying to autoload a constant and it failed.
* | | | | Merge pull request #7515 from senny/custom_inheritance_column_test_refactoringRafael Mendonça França2012-09-039-65/+66
|\ \ \ \ \ | |/ / / / |/| | | | custom inheritance_column test refactoring
| * | | | test cleanup, remove ruby_type because it's no longer neededYves Senn2012-09-037-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | All tests with a custom inheritance_column use the `Vegtable` model. The field ruby_type on the Company models is no longer needed
| * | | | rewrite inheritance tests with a custom inheritance_columnYves Senn2012-09-034-49/+61
|/ / / / | | | | | | | | | | | | | | | | | | | | previously the tests with and without a custom `inheritance_column` used the same models. Since the model then has both fields this can lead to false positives.
* | | | Merge pull request #7506 from senny/issue_7503Rafael Mendonça França2012-09-035-2/+38
|\ \ \ \ | |/ / / |/| | | #becomes works with configured inheritance_column
| * | | set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-035-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to create a new table because I needed an STI table, which does not have both a "type" and a "custom_type" the test fails with: 1) Error: test_alt_becomes_works_with_sti(InheritanceTest): NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber"> /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes' test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti' test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
* | | | Merge pull request #7502 from xoen/fixed-upgrading-guide-markupCarlos Antonio da Silva2012-09-021-2/+12
|\ \ \ \ | | | | | | | | | | Fixed markup in Upgrading RoR guide [ci skip]
| * | | | Fixed markup in Upgrading RoR guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-2/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two changes: - Using <ruby> syntax for unicode character routes example instead of <tt> since it causes single quotes to be transformed into inverted commas. This makes this required change more eye-catching. - Using <tt> for the j alias and related helpers as written in the documentation guidelines.
* | | | Merge pull request #7504 from behrends/patch-1Carlos Antonio da Silva2012-09-021-1/+1
|\ \ \ \ | |/ / / |/| | | Fix example code: use tasks instead of comments [ci skip]
| * | | Fix example code: use tasks instead of commentsErik Behrends2012-09-021-1/+1
|/ / /
* | | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ \ | | | | | | | | Properly reset the session on reset_session
| * | | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use load_for_write! to ensure a refresh of the session object. This way the new session_id and the empty data will be stored properly. E.g. in the case of the session cookie store this means that a new digest will be returned to the user.
| * | | Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| | | |
| * | | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| | | |
| * | | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
| | | | | | | | | | | | | | | | Fixes #7478
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0117-36/+111
|\ \ \ \
| * | | | copy edits [ci skip]Vijay Dev2012-09-012-4/+2
| | | | |
| * | | | Revert "added .DS_Store to .gitignore"Vijay Dev2012-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc80ebb13328eb5f233f65408ba281bf0f8ce68e. Such changes aren't allowed in docrails.
| * | | | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| | | | |
| * | | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong.
| * | | | Fix my bioPratik Naik2012-08-311-1/+1
| | | | |
| * | | | Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fixed little mistake in the docs
| | * | | | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:04:19 +0000