aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9880 from wangjohn/refactoring_attribute_assignmentRafael Mendonça França2013-03-231-5/+5
|\
| * Refactoring validate_missing_parameters to validate_required_parameters.wangjohn2013-03-231-5/+5
* | Autoload the AlterTable classRafael Mendonça França2013-03-231-0/+1
* | Merge pull request #9888 from zzak/patch-1Rafael Mendonça França2013-03-231-1/+1
|\ \
| * | Don't use hash fragment for travis linkZachary Scott2013-03-231-1/+1
|/ /
* | Merge pull request #9883 from prathamesh-sonpatki/AR-TyposRafael Mendonça França2013-03-231-9/+9
|\ \ | |/ |/|
| * Spelling 'PostgreSQL' correctlyPrathamesh Sonpatki2013-03-231-7/+7
| * Fixed typos in activerecord CHANGELOGPrathamesh Sonpatki2013-03-231-3/+3
|/
* Merge branch 'schema'Aaron Patterson2013-03-2210-104/+230
|\
| * add uuid primary key supportAaron Patterson2013-03-225-3/+30
| * separate primary key from column typeAaron Patterson2013-03-221-10/+11
| * push the mysql add_column up to the abstract adapterAaron Patterson2013-03-224-22/+35
| * allow multiple add columnsAaron Patterson2013-03-223-6/+6
| * pull add_column_options! off the pg connection classAaron Patterson2013-03-222-13/+13
| * add a pg visitor for dealing with schema modificationAaron Patterson2013-03-221-4/+21
| * push alter table add column sql in to the schema modification visitorAaron Patterson2013-03-223-14/+51
| * there is no reason to check for an already defined columnAaron Patterson2013-03-221-1/+1
| * push column initialization down to the factory methodAaron Patterson2013-03-221-13/+13
| * @columns list is no longer necessaryAaron Patterson2013-03-221-8/+4
| * keep ivars private, do not manipulate them outside their owner objectAaron Patterson2013-03-222-1/+5
| * factory methods should not alter object stateAaron Patterson2013-03-221-5/+7
| * push SQL generation inside the schema creation objectAaron Patterson2013-03-224-12/+20
| * mostly decouple TableDefinition from the database connectionAaron Patterson2013-03-223-5/+5
| * remove to_sql from TableDefinitionAaron Patterson2013-03-223-9/+5
| * decouple column definition from the database connectionAaron Patterson2013-03-223-11/+11
| * stop depending on sql_type in pgAaron Patterson2013-03-221-6/+8
| * remove knowledge of SQL from the column definition objectAaron Patterson2013-03-223-24/+47
* | squelch an unused variable warningAaron Patterson2013-03-221-0/+1
|/
* Remove exception variable from rescue blockCarlos Antonio da Silva2013-03-221-2/+2
* Merge pull request #9866 from choudhuryanupam/fix_connection_testCarlos Antonio da Silva2013-03-221-1/+1
|\
| * Removed unused loop variableAnupam Choudhury2013-03-221-1/+1
* | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_testCarlos Antonio da Silva2013-03-221-2/+1
|\ \
| * | Removed unnecessary blockAnupam Choudhury2013-03-221-2/+1
* | | Merge pull request #9871 from arunagw/stringio-require-jrubyGuillermo Iguaran2013-03-221-0/+1
|\ \ \
| * | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
| |/ /
* | | Don't kill the consoleJon Leighton2013-03-221-10/+2
* | | Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_resetJon Leighton2013-03-221-0/+7
|\ \ \
| * | | test-case to prevent resetting associations when preloading twice.Yves Senn2013-03-221-0/+7
|/ / /
* | | Merge pull request #9707 from route/updates_another_recordJon Leighton2013-03-224-2/+18
|\ \ \ | |/ / |/| |
| * | When we pass id to update_attributes it will try to set new id for that recordDmitry Vorotilin2013-03-224-2/+18
|/ /
* | Send SIGTERM, not SIGQUIT.Jon Leighton2013-03-221-1/+1
* | Delete failing testJon Leighton2013-03-221-36/+0
|/
* Merge pull request #9863 from robertomiranda/require-bcrypt-rubyGuillermo Iguaran2013-03-211-2/+7
|\
| * Change Standard error when is required bcrypt-ruby and failsrobertomiranda2013-03-211-2/+7
* | Merge pull request #9861 from pivotalcommon/masterJeremy Kemper2013-03-212-1/+10
|\ \ | |/ |/|
| * Allows setting fixture_path to a PathnameAlexander Murmann and Can Berk Güder2013-03-212-1/+10
|/
* Merge pull request #9853 from wangjohn/adding_bang_to_raise_methodRafael Mendonça França2013-03-216-8/+8
|\
| * Adding a bang to method name of raise_on_type_mismatch.wangjohn2013-03-216-8/+8
|/
* Merge pull request #9836 from Intrepidd/tidy-requireCarlos Antonio da Silva2013-03-212-6/+3
|\
| * Tidying up some require : removing useless sort and homogenizing with the res...Intrepidd2013-03-202-6/+3