| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #4835 from ↵ | Carlos Antonio da Silva | 2012-05-19 | 1 | -3/+3 |
| |\ | | | | | | | | | pacoguzman/refactor_define_restrict_dependency_method Refactor define_restrict_dependency_method using reflection | ||||
| | * | Refactor define_restrict_dependency_method using reflection | Paco Guzman | 2012-02-01 | 1 | -3/+3 |
| | | | |||||
| * | | Ensure that CollectionAssociation#replace returns proper target | Piotr Sarnacki | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association. | ||||
| * | | Merge pull request #6376 from jgaskins/timestamp-microseconds | Jeremy Kemper | 2012-05-18 | 1 | -1/+1 |
| |\ \ | | | | | | | Increase numeric-timestamp precision to nanoseconds | ||||
| | * | | Increase `AR#cache_key` precision to nanoseconds | Jamie Gaskins | 2012-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix #delete_all with habtm with :delete_sql | Jon Leighton | 2012-05-18 | 1 | -0/+1 |
| | | | | |||||
| * | | | no longer need #delete_all_on_destroy | Jon Leighton | 2012-05-18 | 5 | -17/+2 |
| | | | | |||||
| * | | | Perf: Don't load the association for #delete_all. | Jon Leighton | 2012-05-18 | 4 | -10/+35 |
| | | | | | | | | | | | | | Bug #6289 | ||||
| * | | | Merge pull request #6382 from oscardelben/refactor_migration_generator | José Valim | 2012-05-18 | 1 | -6/+3 |
| |\ \ \ | |/ / |/| | | Refactor migration generator | ||||
| | * | | Refactor migration generator | Oscar Del Ben | 2012-05-18 | 1 | -6/+3 |
| | | | | |||||
| * | | | Merge pull request #6238 from pwnall/pgsql_bytea_limit | Aaron Patterson | 2012-05-17 | 1 | -8/+19 |
| |\ \ \ | | | | | | | | | Postgresql doesn't accept limits on binary (bytea) columns. | ||||
| | * | | | Postgresql doesn't accept limits on binary (bytea) columns. | Victor Costan | 2012-05-09 | 1 | -8/+19 |
| | | | | | |||||
| * | | | | Don't destroy readonly models | Johannes Barre | 2012-05-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #6058 from ↵ | Jon Leighton | 2012-05-17 | 2 | -6/+31 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects | ||||
| | * | | | | Relation#from to accept other Relation objects | Radoslav Stankov | 2012-05-17 | 2 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a) | ||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 3 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| | * | | | | | Revert "Update docs in sqlite3 adapter" | Vijay Dev | 2012-05-17 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e. Reason: Lot of the additions aren't adding value. [ci skip] | ||||
| | * | | | | | Fix typos in docs for ActiveRecord::Core::arel_table [ci skip] | Mark Rushakoff | 2012-05-16 | 1 | -3/+1 |
| | | | | | | | |||||
| | * | | | | | Update AR has_one association example | Alexey Vakhov | 2012-05-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Update docs in sqlite3 adapter | Oscar Del Ben | 2012-05-15 | 1 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #99 from GRoguelon/master | Vijay Dev | 2012-05-15 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix an error in methods example of instanciated fixtures. | ||||
| | | * | | | | | Fix an error in example in methods of instanciated fixtures. | Geoffrey Roguelon | 2012-05-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix typo [ci skip] | Peter Suschlik | 2012-05-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #5453 from ↵ | Aaron Patterson | 2012-05-16 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number. | ||||
| | * | | | | | | | when using a preloaded array and the uniq flag is set then return the size ↵ | Jon Rowe | 2012-03-15 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the uniq array | ||||
| * | | | | | | | | Merge pull request #6358 from jfirebaugh/schema_define | Aaron Patterson | 2012-05-16 | 1 | -7/+10 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Call methods on the correct instance in AR::Schema.define | ||||
| | * | | | | | | | | Call methods on the correct instance in AR::Schema.define | John Firebaugh | 2012-05-16 | 1 | -7/+10 |
| | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema. | ||||
| * | | | | | | | | Fix CollectionAssociation#replace to return new target (closes #6231) | Piotr Sarnacki | 2012-05-16 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6192 from ↵ | Aaron Patterson | 2012-05-16 | 3 | -7/+65 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter | ||||
| | * | | | | | | | | Removes NetAddr dependency | Dan McClain | 2012-05-08 | 1 | -6/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Converts inet and cidr columns to NetAddr::CIDR | Dan Seaver | 2012-05-07 | 3 | -3/+41 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Adds migration and schema dump support for INET, CIDR, and MACADDR | Dan Seaver | 2012-05-05 | 1 | -4/+23 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacks | Aaron Patterson | 2012-05-16 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Allow manual rollbacks in after_save to reset object correctly | ||||
| | * | | | | | | | | Allow manual rollbacks in after_save to reset object correctly | Mark McSpadden | 2012-03-21 | 1 | -1/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | assuming there is only one column, we can simplify the type cast loop | Aaron Patterson | 2012-05-16 | 1 | -7/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless | Aaron Patterson | 2012-05-16 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast. | ||||
| * | | | | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixes | Aaron Patterson | 2012-05-16 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bring SqlByPassTest to light and fix broken tests | ||||
| | * | | | | | | | | | Rename test file so that the test suite matches it, implement `persisted?` ↵ | Marcelo Silveira | 2012-05-16 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error). | ||||
| * | | | | | | | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errors | Aaron Patterson | 2012-05-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | ||||
| | * | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | Erich Menge | 2012-05-16 | 1 | -1/+1 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #6336 from erichmenge/patch-pluck-fragment | Carlos Antonio da Silva | 2012-05-16 | 1 | -8/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column | ||||
| | * | | | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column type. | Erich Menge | 2012-05-16 | 1 | -8/+3 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_type | Piotr Sarnacki | 2012-05-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | SQLite3 doesn't actually support the 'time' type. | ||||
| | * | | | | | | | | | | SQLite3 doesn't actually support the 'time' type. | Erich Menge | 2012-05-15 | 1 | -1/+1 |
| | |/ / / / / / / / / | |||||
| * / / / / / / / / / | Remove useless check of adapter | Oscar Del Ben | 2012-05-15 | 1 | -4/+0 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Remove unnecessary calls to primary_key on sqlite3_adapter | Carlos Galdino | 2012-05-15 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Expand and improve #pluck docs | Jeremy Kemper | 2012-05-15 | 1 | -6/+27 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Restore support for Model.pluck('sql fragment') | Jeremy Kemper | 2012-05-15 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove extra `end` in arel_table docs. [ci skip] | Carlos Antonio da Silva | 2012-05-15 | 1 | -8/+6 |
| | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4 | ||||
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |