aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* port some mocha to minitest/mockAaron Patterson2012-05-183-222/+222
* Merge pull request #6382 from oscardelben/refactor_migration_generatorJosé Valim2012-05-181-6/+3
|\
| * Refactor migration generatorOscar Del Ben2012-05-181-6/+3
* | fix typo [ci skip]Jon Leighton2012-05-181-1/+1
* | add changelogs about deprecated stuff [ci skip]Jon Leighton2012-05-181-1/+55
* | quarantine more deprecated stuffJon Leighton2012-05-184-36/+36
* | quarantine deprecated testsJon Leighton2012-05-1810-578/+605
* | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-172-8/+20
|\ \
| * | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-092-8/+20
* | | Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-173-0/+7
|\ \ \
| * | | Don't destroy readonly modelsJohannes Barre2012-05-173-0/+7
* | | | Fix warning: ambiguous first argument.kennyj2012-05-181-1/+1
|/ / /
* | | Merge pull request #6058 from RStankov/relation-from-to-accept-other-relation...Jon Leighton2012-05-175-7/+51
|\ \ \
| * | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-175-7/+51
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-173-3/+3
|\ \ \ \
| * | | | Revert "Update docs in sqlite3 adapter"Vijay Dev2012-05-171-12/+12
| * | | | Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]Mark Rushakoff2012-05-161-3/+1
| * | | | Update AR has_one association exampleAlexey Vakhov2012-05-161-1/+1
| * | | | Update docs in sqlite3 adapterOscar Del Ben2012-05-151-12/+12
| * | | | Revert "corrected some misspelling"Vijay Dev2012-05-151-3/+3
| * | | | Merge pull request #99 from GRoguelon/masterVijay Dev2012-05-151-1/+1
| |\ \ \ \
| | * | | | Fix an error in example in methods of instanciated fixtures.Geoffrey Roguelon2012-05-151-1/+1
| * | | | | corrected some misspellingAngelo capilleri2012-05-151-3/+3
| * | | | | Fix typo [ci skip]Peter Suschlik2012-05-151-1/+1
* | | | | | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when...Aaron Patterson2012-05-162-2/+12
|\ \ \ \ \ \
| * | | | | | when using a preloaded array and the uniq flag is set then return the size of...Jon Rowe2012-03-152-2/+12
* | | | | | | Merge pull request #6358 from jfirebaugh/schema_defineAaron Patterson2012-05-162-7/+17
|\ \ \ \ \ \ \
| * | | | | | | Call methods on the correct instance in AR::Schema.defineJohn Firebaugh2012-05-162-7/+17
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
* | | | | | | Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq...Aaron Patterson2012-05-165-15/+97
|\ \ \ \ \ \ \
| * | | | | | | Removes NetAddr dependencyDan McClain2012-05-083-10/+11
| * | | | | | | Converts inet and cidr columns to NetAddr::CIDRDan Seaver2012-05-075-7/+48
| * | | | | | | Adds migration and schema dump support for INET, CIDR, and MACADDRDan Seaver2012-05-053-7/+47
* | | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-162-1/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Allow manual rollbacks in after_save to reset object correctlyMark McSpadden2012-03-212-1/+46
* | | | | | | | assuming there is only one column, we can simplify the type cast loopAaron Patterson2012-05-161-7/+6
* | | | | | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unlessAaron Patterson2012-05-162-5/+16
* | | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-162-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename test file so that the test suite matches it, implement `persisted?` fo...Marcelo Silveira2012-05-162-5/+15
* | | | | | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errorsAaron Patterson2012-05-164-7/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272Erich Menge2012-05-164-7/+34
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6336 from erichmenge/patch-pluck-fragmentCarlos Antonio da Silva2012-05-162-8/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column type.Erich Menge2012-05-162-8/+6
| |/ / / / / / / /
* | | | | | | | | Remove unneeded testsPiotr Sarnacki2012-05-161-12/+0
* | | | | | | | | Merge pull request #6347 from avakhov/ar-changelog-misprintVijay Dev2012-05-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix misprint in AR changelogAlexey Vakhov2012-05-161-1/+1
* | | | | | | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_typePiotr Sarnacki2012-05-154-4/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | SQLite3 doesn't actually support the 'time' type.Erich Menge2012-05-154-4/+16
| |/ / / / / / / /
* / / / / / / / / Remove useless check of adapterOscar Del Ben2012-05-151-4/+0
|/ / / / / / / /
* | | | | | | | Remove unnecessary calls to primary_key on sqlite3_adapterCarlos Galdino2012-05-151-1/+1