aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-08-2858-477/+1251
|\ | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb
| * Implement count limit/offset support for has_many associationsTarmo Tänav2008-08-272-1/+16
| | | | | | | | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Alias included associations if needed when doing a countTarmo Tänav2008-08-272-2/+12
| | | | | | | | | | | | [#302 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Dirty: treat two changes resulting in the original value as being unchanged.Tom Lea2008-08-272-1/+40
| | | | | | | | | | | | [#798 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:resolved]Lars Kanis2008-08-271-1/+1
| |
| * respond_to? passes along splat args to avoid introducing the second arg if ↵Jeremy Kemper2008-08-271-2/+2
| | | | | | | | it was omitted
| * Merge commit 'sven/i18n'Jeremy Kemper2008-08-272-15/+8
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| | * i18n: fixed failing tests after removing #populate and #store_translationsMarko Seppae2008-08-271-12/+7
| | |
| | * I18n: removed call to #populate from main library filesMarko Seppae2008-08-271-3/+1
| | |
| * | Fix two has_one :through errorspivotal2008-08-273-3/+15
| |/ | | | | | | | | | | | | | | * Set the association target on assignment; * Reset target to nil on reset, rather than empty array. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#895 state:committed]
| * Performance: reduce garbage created by ↵Joshua Peek2008-08-261-1/+8
| | | | | | | | ActiveRecord::Calculations#column_alias_for
| * Fix yet another implicit order dependant testTarmo Tänav2008-08-261-3/+3
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Print the queries that were executed if assert_queries failsTarmo Tänav2008-08-261-1/+1
| |
| * Just look at sql_type when testing that the correct database-specific type ↵Tarmo Tänav2008-08-261-4/+1
| | | | | | | | | | | | was used Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-263-6/+7
| |\
| | * Include people and readers fixtures to fix test isolation errorJeremy Kemper2008-08-261-2/+2
| | |
| | * fix tests relying on implicit orderingJeremy Kemper2008-08-261-2/+3
| | |
| | * PostgreSQL: pg driver expects nil instead of empty string for missing user/passJeremy Kemper2008-08-261-2/+2
| | |
| * | Back to fetching all versions in ruby instead of letting SQL do it as it's ↵Tarmo Tänav2008-08-261-5/+6
| |/ | | | | | | | | | | difficult to get all databases to convert the text value to a number with the same SQL Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Create mysql binary_fields table with latin1 character set as with utf8 all ↵Tarmo Tänav2008-08-261-2/+2
| | | | | | | | | | | | the limits would have to be divided by 3 to get the expected text types Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Include mysql older than 5.1.23 in the 5.1 series in the list of those that ↵Tarmo Tänav2008-08-261-1/+1
| | | | | | | | | | | | can't handle NULL defaults Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * um.. yeahJeremy Kemper2008-08-261-2/+2
| |
| * typoJeremy Kemper2008-08-261-2/+2
| |
| * fix another ordering failureJeremy Kemper2008-08-261-1/+1
| |
| * fix tests relying on implicit orderingJeremy Kemper2008-08-251-4/+2
| |
| * add dynamic finder bang version to raise RecordNotFoundJosh Susser2008-08-253-1/+24
| | | | | | | | | | | | [#905 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * refactor dynamic finder name matching into its own classJosh Susser2008-08-254-72/+125
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * ensure tests load sibling Active Support instead of a gemJeremy Kemper2008-08-251-0/+1
| |
| * Use DECIMAL instead of INTEGER when casting as mysql doesn't work with just ↵Tarmo Tänav2008-08-251-3/+8
| | | | | | | | | | | | | | | | "INTEGER" and other databases don't like "UNSIGNED" which mysql requires And don't mask exceptions. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Cache migrated versions list in Migrator and use it to fetch the latest ↵Tarmo Tänav2008-08-251-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | migrated version name [#845 state:resolved] Also optimized Migrator#current_version class method to fetch only the latest version number and not all of them. With this change no matter how many migrations there are the schema_migrations table is only SELECTed from once. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Load the first and not the last has_one result when doing join-based eager ↵Tarmo Tänav2008-08-253-0/+17
| | | | | | | | | | | | | | | | | | | | | | loading This matters when the has_one is defined with an order in which case there is an expectation that the first one will be loaded. [#904 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Implement old-skool eagerloading for has_one :throughFrederick Cheung2008-08-252-2/+18
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Harmonize framework require strategy. Don't add self to load path since ↵Jeremy Kemper2008-08-251-10/+7
| | | | | | | | Rails initializer and RubyGems handle it.
| * Fix preloading of has_one through associationsFrederick Cheung2008-08-252-11/+11
| | | | | | | | | | | | [#903 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * strip trailing whitespaceJeremy Kemper2008-08-251-157/+157
| |
| * Ruby 1.9 compat: fix test error masked by old String#each behaviorJeremy Kemper2008-08-251-1/+1
| |
| * I18n: fix activerecord i18n test for classy backendSven Fuchs2008-08-251-1/+1
| |
| * Fix test to assign the module instead of a new instanceJeremy Kemper2008-08-241-1/+1
| |
| * Merge branch 'patches'Michael Koziarski2008-08-244-4/+88
| |\
| | * Rollback the transaction when a before_* callback returns false.Xavier Noria2008-08-244-4/+88
| | | | | | | | | | | | | | | | | | | | | Previously this would have committed the transaction but not carried out save or destroy operation. [#891 state:committed] Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Ruby 1.9 compat: Hash is now flattenable, so explicitly exclude itJeremy Kemper2008-08-231-1/+1
| | |
| * | Don't set "NULL" as a constraint on nullable columns [#398 state:resolved]Tarmo Tänav2008-08-232-10/+6
| |/ | | | | | | This is already the default and adding it breaks SQL standards compatibility.
| * Always require activesupport, even if its constant already existsTarmo Tänav2008-08-231-10/+8
| | | | | | | | | | | | | | | | | | | | This is needed because the existance of the ActiveSupport constant by itself does not guarantee that the whole library has been loaded. Also load the StringInquirer in the Rails#env method as the it might be called inside the initializer block before activesupport itself has been loaded.
| * coerce blank strings to nil values for boolean and integer fieldsJosh Susser2008-08-225-12/+27
| | | | | | | | [#860 state:resolved]
| * Made migrations transactional for PostgreSQL [#834 state:resolved]Tarmo Tänav2008-08-226-4/+59
| | | | | | | | Patch originally from http://dev.rubyonrails.org/ticket/5470
| * Merge branch 'master' into i18nJeremy Kemper2008-08-225-10/+44
| |\
| | * Ensure t.timestamps respects options. [#828 state:resolved]Patrick Reagan2008-08-222-5/+39
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Fixed ordering in ↵Tarmo Tänav2008-08-222-2/+2
| | | | | | | | | | | | test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
| | * Properly quote CREATE DATABASE parameters in postgresql [#771 state:resolved]Tarmo Tänav2008-08-221-3/+3
| | |
| * | Merge commit 'sven/i18n' into i18nJeremy Kemper2008-08-227-142/+478
| |\ \ | | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 15:22:15 +0000