aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-06-3014-39/+57
|\
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵Pratik Naik2009-07-0114-39/+57
| | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question.
* | Merge commit 'rails/master'Emilio Tagua2009-06-304-7/+13
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * Bump up the version to 3.0.preCarl Lerche2009-06-302-4/+4
| |
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ↵Justin French2009-06-302-4/+10
| | | | | | | | | | | | | | | | | | humanizes it This gives you 'Post comment' rather than 'Postcomment' by default. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2120 state:committed]
* | Merge commit 'rails/master'Emilio Tagua2009-06-306-1/+74
|\| | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| | | | | | | | [#2419 state:committed]
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-264-0/+16
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Translate adapter errors that indicate a violated uniqueness constraint to ↵Michael Schuerig2009-06-266-1/+47
| | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Refactoring: Calculations now use construct_finder_sql instead they own method.Emilio Tagua2009-06-232-25/+8
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-2310-7/+53
|\|
| * Revert "Generate proper :counter_sql from :finder_sql when there is a ↵Yehuda Katz + Carl Lerche2009-06-2214-55/+39
| | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql.
| * Generate proper :counter_sql from :finder_sql when there is a newline ↵Patrick Joyce2009-06-2114-39/+55
| | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed a bug where create_table could not be called without a block [#2221 ↵Joseph Wilk2009-06-212-1/+8
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵Brian Hogan2009-06-212-1/+27
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure hm:t#create respects source associations hash conditions [#2090 ↵mattbauer2009-06-214-0/+16
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Simplify AMo validation attribute readerJoshua Peek2009-06-171-4/+0
| |
| * Updated require for AMo moveYehuda Katz + Carl Lerche2009-06-171-1/+1
| |
| * Move model naming into ActiveModelJoshua Peek2009-06-171-0/+1
| |
* | Removed unused methods.Emilio Tagua2009-06-234-127/+1
| |
* | Arel now buils SQL queries for associations. Removed old code andEmilio Tagua2009-06-233-67/+6
| | | | | | | | updated Arel version to support this.
* | Removed old commented codeEmilio Tagua2009-06-231-21/+0
| |
* | Forget about auto scope, it's always explicit.Emilio Tagua2009-06-171-7/+6
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-163-4/+7
|\|
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-123-4/+7
| | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Leave the quoting part to ARelEmilio Tagua2009-06-125-172/+171
|\|
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * HasOneAssociation inherits AssociationProxy since it shares nothing with ↵Emilio Tagua2009-06-121-5/+5
| | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | 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-097-63/+89
|\|
| * disabled base_test.rb tests that were not Oracle compatible (TIME datatype ↵Raimonds Simanovskis2009-06-092-30/+60
| | | | | | | | | | | | is not supported on Oracle, UPDATE does not support ORDER BY) _before_type_cast on Oracle returns Time and not String added Oracle specific schema definition that was missing for test_default_values test Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * 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-083-31/+14
| |
| * Update for Active Model yielding per error not per attributeJeremy Kemper2009-06-081-0/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-0238-2731/+1050
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb
| * Schema dumper now records scale 0 decimal columns as decimal not integer.Giles Alexander2009-06-013-2/+15
| | | | | | | | | | | | | | | | | | | | 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-2983-410/+1198
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2821-21/+21
| | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 07:19:11 +0000