aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Expand)AuthorAgeFilesLines
* Fix intermittent test failuresschneems2016-01-141-0/+1
* Revert "Revert "Set environment even when no migration runs""schneems2016-01-141-1/+28
* Revert "Set environment even when no migration runs"Sean Griffin2016-01-141-28/+1
* Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...Kasper Timm Hansen2016-01-143-18/+0
* Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-143-11/+1
|\
| * `substitute_at` is no longer usedRyuta Kamizono2016-01-143-11/+1
* | Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+7
* | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...Richard Schneeman2016-01-141-1/+28
|\ \ | |/ |/|
| * Set environment even when no migration runsschneems2016-01-111-0/+27
| * Clean up duplicate migration logicschneems2016-01-111-1/+1
* | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-132-0/+7
* | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-131-1/+3
* | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-121-15/+2
* | Change `WhereClause#merge` to same named columns on diff tablesSean Griffin2016-01-121-2/+15
* | Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-122-0/+21
* | Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-122-5/+20
|/
* Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...Ryuta Kamizono2016-01-111-1/+1
* Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-111-10/+10
* Split out token `if` tests to trigger `before_create`.Kasper Timm Hansen2016-01-091-1/+5
* Add conditional_token to users.Kasper Timm Hansen2016-01-091-0/+1
* Support :if and :unless in has_secure_tokenGriffin Smith2016-01-092-0/+13
* Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-081-2/+2
|\
| * Get update_attributes working with SchemaMigrationschneems2016-01-081-2/+2
* | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-081-0/+42
* | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-083-0/+76
|\ \ | |/ |/|
| * Fixing tests and re-locating error checking.schneems2016-01-081-4/+4
| * Use hash like syntax for InternalMetadataschneems2016-01-082-3/+3
| * Prevent destructive action on production databaseschneems2016-01-073-0/+76
* | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-061-0/+16
* | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-061-10/+10
|\ \
| * | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-051-10/+10
* | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-051-3/+12
|\ \ \ | |/ / |/| |
| * | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-051-3/+12
* | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-042-2/+13
|\ \ \
| * | | Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-042-2/+13
* | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-041-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | activerecord: reuse immutable objectsTamir Duberstein2016-01-041-2/+6
| |/ /
* | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-041-0/+5
|\ \ \ | |/ / |/| |
| * | Allow add_to_transaction with null transactionEmanuel Evans2015-12-281-0/+5
* | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
* | | Remove unnecessary enable,disable_extension on testsFumiaki MATSUSHIMA2016-01-022-11/+0
* | | Merge pull request #22105 from morgoth/fix-errors-details-on-autosave-associa...Rafael França2015-12-311-0/+47
|\ \ \
| * | | Fixed setting errors details on autosaved associationsWojciech Wnętrzak2015-10-281-0/+47
* | | | Merge pull request #22241 from kamipo/add_columns_for_distinct_for_mysql57Rafael França2015-12-301-0/+44
|\ \ \ \
| * | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BYRyuta Kamizono2015-12-231-0/+44
* | | | | Merge pull request #22447 from kamipo/fix_test_to_null_agnostic_wayRafael França2015-12-303-3/+14
|\| | | |
| * | | | Fix `test_find_with_order_on_included_associations_with_construct_finder_sql_...Ryuta Kamizono2015-12-193-3/+14
* | | | | Merge pull request #22803 from kamipo/improve_select_one_in_mysql2_adapterRafael França2015-12-301-0/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve `select_one` in `Mysql2Adapter`Ryuta Kamizono2015-12-271-0/+6
* | | | | Merge pull request #22053 from Empact/first-loadedYves Senn2015-12-281-3/+26
|\ \ \ \ \