Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #9888 from zzak/patch-1 | Rafael Mendonça França | 2013-03-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't use hash fragment for travis link | |||||
| * | | | | | | | | Don't use hash fragment for travis link | Zachary Scott | 2013-03-23 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #9883 from prathamesh-sonpatki/AR-Typos | Rafael Mendonça França | 2013-03-23 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixed typos in activerecord CHANGELOG | |||||
| * | | | | | | | Spelling 'PostgreSQL' correctly | Prathamesh Sonpatki | 2013-03-23 | 1 | -7/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixed typos in activerecord CHANGELOG | Prathamesh Sonpatki | 2013-03-23 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'schema' | Aaron Patterson | 2013-03-22 | 10 | -104/+230 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * schema: add uuid primary key support separate primary key from column type push the mysql add_column up to the abstract adapter allow multiple add columns pull add_column_options! off the pg connection class add a pg visitor for dealing with schema modification push alter table add column sql in to the schema modification visitor there is no reason to check for an already defined column push column initialization down to the factory method @columns list is no longer necessary keep ivars private, do not manipulate them outside their owner object factory methods should not alter object state push SQL generation inside the schema creation object mostly decouple TableDefinition from the database connection remove to_sql from TableDefinition decouple column definition from the database connection stop depending on sql_type in pg remove knowledge of SQL from the column definition object | |||||
| * | | | | | | | add uuid primary key support | Aaron Patterson | 2013-03-22 | 5 | -3/+30 | |
| | | | | | | | | ||||||
| * | | | | | | | separate primary key from column type | Aaron Patterson | 2013-03-22 | 1 | -10/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | push the mysql add_column up to the abstract adapter | Aaron Patterson | 2013-03-22 | 4 | -22/+35 | |
| | | | | | | | | ||||||
| * | | | | | | | allow multiple add columns | Aaron Patterson | 2013-03-22 | 3 | -6/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | pull add_column_options! off the pg connection class | Aaron Patterson | 2013-03-22 | 2 | -13/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | add a pg visitor for dealing with schema modification | Aaron Patterson | 2013-03-22 | 1 | -4/+21 | |
| | | | | | | | | ||||||
| * | | | | | | | push alter table add column sql in to the schema modification visitor | Aaron Patterson | 2013-03-22 | 3 | -14/+51 | |
| | | | | | | | | ||||||
| * | | | | | | | there is no reason to check for an already defined column | Aaron Patterson | 2013-03-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | push column initialization down to the factory method | Aaron Patterson | 2013-03-22 | 1 | -13/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | @columns list is no longer necessary | Aaron Patterson | 2013-03-22 | 1 | -8/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | keep ivars private, do not manipulate them outside their owner object | Aaron Patterson | 2013-03-22 | 2 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | factory methods should not alter object state | Aaron Patterson | 2013-03-22 | 1 | -5/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | push SQL generation inside the schema creation object | Aaron Patterson | 2013-03-22 | 4 | -12/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | mostly decouple TableDefinition from the database connection | Aaron Patterson | 2013-03-22 | 3 | -5/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | remove to_sql from TableDefinition | Aaron Patterson | 2013-03-22 | 3 | -9/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | decouple column definition from the database connection | Aaron Patterson | 2013-03-22 | 3 | -11/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | stop depending on sql_type in pg | Aaron Patterson | 2013-03-22 | 1 | -6/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | remove knowledge of SQL from the column definition object | Aaron Patterson | 2013-03-22 | 3 | -24/+47 | |
| | | | | | | | | ||||||
* | | | | | | | | squelch an unused variable warning | Aaron Patterson | 2013-03-22 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Remove exception variable from rescue block | Carlos Antonio da Silva | 2013-03-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just raising from the rescue block will re-raise the exception, so the variable is not necessary. | |||||
* | | | | | | | Merge pull request #9866 from choudhuryanupam/fix_connection_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed unused loop variable | |||||
| * | | | | | | | Removed unused loop variable | Anupam Choudhury | 2013-03-22 | 1 | -1/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed unnecessary block | |||||
| * | | | | | | | Removed unnecessary block | Anupam Choudhury | 2013-03-22 | 1 | -2/+1 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9871 from arunagw/stringio-require-jruby | Guillermo Iguaran | 2013-03-22 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | StringIO is not required by default in JRuby | |||||
| * | | | | | | | StringIO is not required by default in JRuby | Arun Agrawal | 2013-03-22 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Don't kill the console | Jon Leighton | 2013-03-22 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761. | |||||
* | | | | | | | Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_reset | Jon Leighton | 2013-03-22 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | test-case to prevent resetting associations when preloading twice. | |||||
| * | | | | | | | test-case to prevent resetting associations when preloading twice. | Yves Senn | 2013-03-22 | 1 | -0/+7 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb | |||||
* | | | | | | | Merge pull request #9707 from route/updates_another_record | Jon Leighton | 2013-03-22 | 4 | -2/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | When strong_parameters had been included, this case of update became possible | |||||
| * | | | | | | When we pass id to update_attributes it will try to set new id for that record | Dmitry Vorotilin | 2013-03-22 | 4 | -2/+18 | |
|/ / / / / / | ||||||
* | | | | | | Send SIGTERM, not SIGQUIT. | Jon Leighton | 2013-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761. | |||||
* | | | | | | Delete failing test | Jon Leighton | 2013-03-22 | 1 | -36/+0 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it. | |||||
* | | | | | Merge pull request #9863 from robertomiranda/require-bcrypt-ruby | Guillermo Iguaran | 2013-03-21 | 1 | -2/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change Standard error when is required bcrypt-ruby and fails | |||||
| * | | | | | Change Standard error when is required bcrypt-ruby and fails | robertomiranda | 2013-03-21 | 1 | -2/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9861 from pivotalcommon/master | Jeremy Kemper | 2013-03-21 | 2 | -1/+10 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Allow fixture_path to be a Pathname | |||||
| * | | | | | Allows setting fixture_path to a Pathname | Alexander Murmann and Can Berk Güder | 2013-03-21 | 2 | -1/+10 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9853 from wangjohn/adding_bang_to_raise_method | Rafael Mendonça França | 2013-03-21 | 6 | -8/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Adding a bang to method name of raise_on_type_mismatch. | |||||
| * | | | | | Adding a bang to method name of raise_on_type_mismatch. | wangjohn | 2013-03-21 | 6 | -8/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9836 from Intrepidd/tidy-require | Carlos Antonio da Silva | 2013-03-21 | 2 | -6/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Tidying up some require and removing overhead caused by sorting | |||||
| * | | | | | Tidying up some require : removing useless sort and homogenizing with the ↵ | Intrepidd | 2013-03-20 | 2 | -6/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | rest of the code the wat the includes are done | |||||
* | | | | | | Merge pull request #9847 from vipulnsward/fix_sqlite_test | Rafael Mendonça França | 2013-03-21 | 2 | -3/+3 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix copy table index test; Change == to ! on false in travis.rb | |||||
| * | | | | | Fix copy table index test; Change == to ! on false in travis.rb | Vipul A M | 2013-03-21 | 2 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7706 from iangreenleaf/multiple_counter_caches | Jeremy Kemper | 2013-03-20 | 11 | -9/+45 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update other counter caches on destroy |