Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | create a transaction object and point AR objects at that object during a | Aaron Patterson | 2012-09-07 | 4 | -12/+55 | |
| | | | | | | | | | | | | | | | | | | | | transaction. | |||||
* | | | | | Fix AS tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. | |||||
* | | | | | Fix AR tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. | |||||
* | | | | | Bump builder dependencies in Active Model and Action Pack | Carlos Antonio da Silva | 2012-09-07 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Update Active Model xml serialization test to reflect a change in builder | Carlos Antonio da Silva | 2012-09-07 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. | |||||
* | | | | | Use merge! to merge additional options onto default options | Carlos Antonio da Silva | 2012-09-07 | 1 | -4/+3 | |
| | | | | | ||||||
* | | | | | Fix Active Support changelog formatting [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Remove 3.2.x entries from Active Record changelog [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -100/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 810a50dacf9ddddc1d59c1cb350e8ce785c8bf85, the new policy is to keep old changelogs in their own branches, to avoid manual syncing across different branches. Please check that commit for more reasoning about the new policy. | |||||
* | | | | | Add Changelog entry for #4976: fix eager load associations without pks [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -0/+22 | |
| | | | | | ||||||
* | | | | | Merge pull request #7552 from guilleiguaran/dalli-session-store | Santiago Pastorino | 2012-09-07 | 3 | -13/+8 | |
|\| | | | | | | | | | | | | | | Use Dalli for memcache session store | |||||
| * | | | | Dalli doesn't support autoloading of unloaded classes | Guillermo Iguaran | 2012-09-06 | 1 | -5/+0 | |
| | | | | | ||||||
| * | | | | Use dalli 2.2.1 or prior to fix failing tests in memcache session store | Guillermo Iguaran | 2012-09-06 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | More fixes for action pack tests with Dalli. | Arun Agrawal | 2012-09-06 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Let's run action pack tests with Dalli | Arun Agrawal | 2012-09-06 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | There is no memcache gem left in repo. | |||||
* | | | | | Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatch | José Valim | 2012-09-07 | 3 | -8/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | AS::Callbacks: deprecate monkey patch of object callbacks | |||||
| * | | | | | AS::Callbacks: deprecate monkey patch of object callbacks | Bogdan Gusiev | 2012-09-07 | 3 | -8/+9 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4976 from kreynolds/fix_eager_without_pkey | Jon Leighton | 2012-09-07 | 2 | -1/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix eagerly loading associations without primary keys | |||||
| * | | | | | Change JoinPart test from an integration to a unit test | Kelley Reynolds | 2012-07-05 | 2 | -13/+8 | |
| | | | | | | ||||||
| * | | | | | Fix eagerly loading associations without primary keys | Kelley Reynolds | 2012-02-09 | 2 | -1/+14 | |
| | | | | | | ||||||
* | | | | | | fix tests on Ruby 2.0.0 | Aaron Patterson | 2012-09-06 | 1 | -1/+1 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #7549 from asanghi/master | Carlos Antonio da Silva | 2012-09-06 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Changelog example in Action Mailer [ci skip] | |||||
| * | | | | | fix bad changelog example | Aditya Sanghi | 2012-09-07 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7550 from sikachu/master-changelog | Carlos Antonio da Silva | 2012-09-06 | 1 | -0/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update Active Record CHANGELOG for #7419 [ci skip] | |||||
| * | | | | | Update Active Record CHANGELOG for #7419 | Prem Sichanugrist | 2012-09-06 | 1 | -0/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7419 from releu/fix-invalid-filename-migration-generator | José Valim | 2012-09-06 | 2 | -0/+16 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Ensure valid migration filename on generating migration | |||||
| * | | | | add mini-validator on creating migration | Jan Bernacki | 2012-09-06 | 2 | -0/+16 | |
|/ / / / | | | | | | | | | | | | | move validation to AR | |||||
* | | | | Merge pull request #7542 from aaronrenner/patch-2 | José Valim | 2012-09-06 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fixed around callback with lambda example | |||||
| * | | | | Fixed around callback with lambda example | Aaron Renner | 2012-09-06 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | This is a follow up to issue #7535 | |||||
* | | | | we already have the module objects, do not constantize | Xavier Noria | 2012-09-06 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | I have also chosen a variable name that matches the parameter in the definition of load_missing_constant. | |||||
* | | | | restores awesome comment | Xavier Noria | 2012-09-06 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | Those who say source code should be without comments lie. | |||||
* | | | | no more const_missing combinatorics | Xavier Noria | 2012-09-06 | 1 | -41/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, const_missing had a loop to try parent namespaces if the constant lookup failed, but at the same time delegated to load_missing_constant which in turn also walks up parent namespaces calling const_missing by hand. In the case of missing constants this results in repeated work in some funky nested way. | |||||
* | | | | Merge pull request #7397 from asanghi/master | José Valim | 2012-09-06 | 4 | -3/+58 | |
|\ \ \ \ | | | | | | | | | | | Allow delivery method options to be set per mail instance | |||||
| * | | | | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 4 | -3/+58 | |
| | | | | | ||||||
* | | | | | Put the create_table block in a transaction. | Rafael Mendonça França | 2012-09-05 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This will solve the issue that abort the connection transaction when we skip the tests. | |||||
* | | | | | Merge pull request #7527 from guedes/pg9.2_json_support | Rafael Mendonça França | 2012-09-05 | 9 | -4/+135 | |
|\ \ \ \ \ | | | | | | | | | | | | | AR supporting new JSON data type on PostgreSQL >= 9.2 | |||||
| * | | | | | ActiveRecord support to PostgreSQL 9.2 JSON type | Dickson S. Guedes | 2012-09-05 | 9 | -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ça | 2012-09-05 | 1 | -0/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #7532 from al2o3cr/fix_store_bugs | Rafael Mendonça França | 2012-09-05 | 3 | -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 Jones | 2012-09-05 | 3 | -4/+12 | |
| |/ / / / | | | | | | | | | | | | | | | | store_accessor | |||||
* | | | | | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_words | Rafael Mendonça França | 2012-09-05 | 5 | -3/+21 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix pluck when columns/tables are reserved words. | |||||
| * | | | | | Fix pluck when columns/tables are reserved words. | Ian Lesperance | 2012-09-05 | 5 | -3/+21 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7525 from ↵ | Rafael Mendonça França | 2012-09-05 | 2 | -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 Abshere | 2012-09-05 | 2 | -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ça | 2012-09-05 | 1 | -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 Digestor | Rafael Mendonça França | 2012-09-05 | 2 | -16/+22 | |
| | | | | | | ||||||
* | | | | | | Remove unneeded requires | Rafael Mendonça França | 2012-09-05 | 1 | -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_time | Rafael Mendonça França | 2012-09-05 | 3 | -1/+23 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix for time type columns with invalid time value | |||||
| * | | | | | | Update changelog with time column type casting fix | Adam Meehan | 2012-09-05 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | Fix for time type columns with invalid time | Adam Meehan | 2012-09-05 | 2 | -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. |