Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge scoped :joins together instead of overwriting them. May expose scoping ↵ | Andrew White | 2008-08-28 | 4 | -15/+109 |
| | | | | | | | | bugs in your code! [#501 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 support. | Ernie Miller | 2008-08-28 | 6 | -36/+49 |
| | | | | | | [#831 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Implement count limit/offset support for has_many associations | Tarmo Tänav | 2008-08-27 | 2 | -1/+16 |
| | | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Alias included associations if needed when doing a count | Tarmo Tänav | 2008-08-27 | 2 | -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 Lea | 2008-08-27 | 2 | -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 Kanis | 2008-08-27 | 1 | -1/+1 |
| | |||||
* | respond_to? passes along splat args to avoid introducing the second arg if ↵ | Jeremy Kemper | 2008-08-27 | 1 | -2/+2 |
| | | | | it was omitted | ||||
* | Merge commit 'sven/i18n' | Jeremy Kemper | 2008-08-27 | 2 | -15/+8 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| * | i18n: fixed failing tests after removing #populate and #store_translations | Marko Seppae | 2008-08-27 | 1 | -12/+7 |
| | | |||||
| * | I18n: removed call to #populate from main library files | Marko Seppae | 2008-08-27 | 1 | -3/+1 |
| | | |||||
* | | Fix two has_one :through errors | pivotal | 2008-08-27 | 3 | -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 Peek | 2008-08-26 | 1 | -1/+8 |
| | | | | ActiveRecord::Calculations#column_alias_for | ||||
* | Fix yet another implicit order dependant test | Tarmo Tänav | 2008-08-26 | 1 | -3/+3 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Print the queries that were executed if assert_queries fails | Tarmo Tänav | 2008-08-26 | 1 | -1/+1 |
| | |||||
* | Just look at sql_type when testing that the correct database-specific type ↵ | Tarmo Tänav | 2008-08-26 | 1 | -4/+1 |
| | | | | | | was used Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-26 | 3 | -6/+7 |
|\ | |||||
| * | Include people and readers fixtures to fix test isolation error | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | | |||||
| * | fix tests relying on implicit ordering | Jeremy Kemper | 2008-08-26 | 1 | -2/+3 |
| | | |||||
| * | PostgreSQL: pg driver expects nil instead of empty string for missing user/pass | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | | |||||
* | | Back to fetching all versions in ruby instead of letting SQL do it as it's ↵ | Tarmo Tänav | 2008-08-26 | 1 | -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änav | 2008-08-26 | 1 | -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änav | 2008-08-26 | 1 | -1/+1 |
| | | | | | | can't handle NULL defaults Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | um.. yeah | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | |||||
* | typo | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | |||||
* | fix another ordering failure | Jeremy Kemper | 2008-08-26 | 1 | -1/+1 |
| | |||||
* | fix tests relying on implicit ordering | Jeremy Kemper | 2008-08-25 | 1 | -4/+2 |
| | |||||
* | add dynamic finder bang version to raise RecordNotFound | Josh Susser | 2008-08-25 | 3 | -1/+24 |
| | | | | | | [#905 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | refactor dynamic finder name matching into its own class | Josh Susser | 2008-08-25 | 4 | -72/+125 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | ensure tests load sibling Active Support instead of a gem | Jeremy Kemper | 2008-08-25 | 1 | -0/+1 |
| | |||||
* | Use DECIMAL instead of INTEGER when casting as mysql doesn't work with just ↵ | Tarmo Tänav | 2008-08-25 | 1 | -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änav | 2008-08-25 | 1 | -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änav | 2008-08-25 | 3 | -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 :through | Frederick Cheung | 2008-08-25 | 2 | -2/+18 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Harmonize framework require strategy. Don't add self to load path since ↵ | Jeremy Kemper | 2008-08-25 | 1 | -10/+7 |
| | | | | Rails initializer and RubyGems handle it. | ||||
* | Fix preloading of has_one through associations | Frederick Cheung | 2008-08-25 | 2 | -11/+11 |
| | | | | | | [#903 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | strip trailing whitespace | Jeremy Kemper | 2008-08-25 | 1 | -157/+157 |
| | |||||
* | Ruby 1.9 compat: fix test error masked by old String#each behavior | Jeremy Kemper | 2008-08-25 | 1 | -1/+1 |
| | |||||
* | I18n: fix activerecord i18n test for classy backend | Sven Fuchs | 2008-08-25 | 1 | -1/+1 |
| | |||||
* | Fix test to assign the module instead of a new instance | Jeremy Kemper | 2008-08-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'patches' | Michael Koziarski | 2008-08-24 | 4 | -4/+88 |
|\ | |||||
| * | Rollback the transaction when a before_* callback returns false. | Xavier Noria | 2008-08-24 | 4 | -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 it | Jeremy Kemper | 2008-08-23 | 1 | -1/+1 |
| | | |||||
* | | Don't set "NULL" as a constraint on nullable columns [#398 state:resolved] | Tarmo Tänav | 2008-08-23 | 2 | -10/+6 |
|/ | | | | This is already the default and adding it breaks SQL standards compatibility. | ||||
* | Always require activesupport, even if its constant already exists | Tarmo Tänav | 2008-08-23 | 1 | -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 fields | Josh Susser | 2008-08-22 | 5 | -12/+27 |
| | | | | [#860 state:resolved] | ||||
* | Made migrations transactional for PostgreSQL [#834 state:resolved] | Tarmo Tänav | 2008-08-22 | 6 | -4/+59 |
| | | | | Patch originally from http://dev.rubyonrails.org/ticket/5470 | ||||
* | Merge branch 'master' into i18n | Jeremy Kemper | 2008-08-22 | 5 | -10/+44 |
|\ | |||||
| * | Ensure t.timestamps respects options. [#828 state:resolved] | Patrick Reagan | 2008-08-22 | 2 | -5/+39 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed ordering in ↵ | Tarmo Tänav | 2008-08-22 | 2 | -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änav | 2008-08-22 | 1 | -3/+3 |
| | |