aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'rails/master'Emilio Tagua2009-06-124-98/+6
|\|
| * Move observing notify helper into AMoJoshua Peek2009-06-111-5/+0
| |
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-103-93/+6
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-101-8/+8
|\|
| * Whitelist the methods which are called by multiparameter attribute assignment.Michael Koziarski2009-06-101-8/+8
| | | | | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904.
* | Merge branch 'update_all'Emilio Tagua2009-06-101-10/+28
|\ \
| * | Initial update_all migrationEmilio Tagua2009-06-101-10/+28
| | |
* | | Use array of orders instead of string concatenationEmilio Tagua2009-06-101-7/+5
|/ /
* | Revert "Use ARel in SQL generation through associations"Emilio Tagua2009-06-101-28/+10
| | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a.
* | Use ARel in SQL generation through associationsEmilio Tagua2009-06-101-10/+28
| |
* | Use ARel in SQL generation through associationsEmilio Tagua2009-06-102-15/+19
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-094-29/+25
|\|
| * PostgreSQL adapter should call thread safe quote_string functionEugene Pimenov2009-06-091-2/+14
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fix AR json encodingJeremy Kemper2009-06-082-27/+10
| |
| * Update for Active Model yielding per error not per attributeJeremy Kemper2009-06-081-0/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-0223-975/+334
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb
| * Schema dumper now records scale 0 decimal columns as decimal not integer.Giles Alexander2009-06-011-2/+9
| | | | | | | | | | | | | | | | | | | | The schema dumper would dump out any decimal or numeric column that had a zero scale as an integer column. This will cause problems for very large precision columns on some DBMSs, particularly PostgreSQL. It also looks strange to see your column change type after moving through schema.rb. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2741 state:committed]
| * AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-291-2/+2
| |
| * AS::Concern includes InstanceMethods module if it existsJoshua Peek2009-05-291-2/+0
| |
| * Merge branch 'master' into active_modelJoshua Peek2009-05-2943-249/+387
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb
| | * Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵Joshua Peek2009-05-2819-19/+19
| | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
| * | Merge branch 'master' into active_modelPratik Naik2009-04-228-70/+169
| |\ \ | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb
| * | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵Pratik Naik2009-03-211-13/+14
| | | | | | | | | | | | | | | | Model.validate :method and likewise
| * | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecordPratik Naik2009-03-212-4/+13
| | | |
| * | | Add I18n translations to ActiveModel and move more AR specific parts to ↵Pratik Naik2009-03-201-0/+115
| | | | | | | | | | | | | | | | ActiveRecord::Validations
| * | | Include ActiveModel::Validations from ActiveRecord::ValidationsPratik Naik2009-03-202-21/+30
| | | |
| * | | Make Active Resource use ActiveModel::ErrorsPratik Naik2009-03-191-3/+1
| | | |
| * | | Move uniqueness and association validations to Active RecordPratik Naik2009-03-193-0/+211
| | | |
| * | | Move all the Active Record validations to Active ModelPratik Naik2009-03-194-1003/+13
| | | |
* | | | Set ActiveRecord as Arel engine on load.Emilio Tagua2009-06-022-2/+3
| | | |
* | | | No need to specify the engine now that it is in active_record.rbEmilio Tagua2009-06-021-2/+2
| | | |
* | | | Refactors to work with latest Arel implementation.Emilio Tagua2009-06-027-20/+26
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-261-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove 'core' fluff. Hookable ActiveSupport.load_all!Jeremy Kemper2009-05-201-1/+1
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-185-10/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\ \ \
| | * | | Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-182-1/+8
| |\| | |
| | * | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | | Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | | | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | | | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-182-0/+3
| | | | |
| * | | | Revert "Get AR CI passing again by requiring the entire core_ext"Jeremy Kemper2009-05-181-3/+0
| |/ / / | | | | | | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547.
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-1824-75/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb
| * | | Fixed limited eager loading associations with numbers in the name [#2668 ↵Benjamin Floering2009-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-171-1/+9
| | | |
| * | | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵Chris Kampmeier2009-05-172-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | has_one :through should not create a new association when assigned nil [#698 ↵Daniel Guettler2009-05-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those.
| * | | Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-142-12/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 02:54:21 +0000