Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 1 | -6/+7 |
|\ | | | | | Add #to_s method to VERSION modules | ||||
| * | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 |
| | | |||||
* | | Merge branch 'jlxw-patch-2' | Rafael Mendonça França | 2013-03-23 | 2 | -2/+6 |
|\ \ | | | | | | | | | | Closes #9184 | ||||
| * | | Fix regex to strip quotations from hstore values | jlxw | 2013-03-23 | 2 | -2/+6 |
| | | | | | | | | | | | | Previously regex did not strip quotation marks where hstore values were multi-line strings. | ||||
* | | | Merge pull request #9891 from doabit/additional_index_support | Rafael Mendonça França | 2013-03-23 | 11 | -9/+125 |
|\ \ \ | |/ / |/| | | | | | | | | Custom index type support with :using. Closes #9451 | ||||
| * | | Custom index type support with :using. | doabit | 2013-03-24 | 11 | -9/+125 |
| | | | |||||
* | | | Merge pull request #9889 from neerajdotname/unscoped | Rafael Mendonça França | 2013-03-23 | 2 | -8/+4 |
|\ \ \ | |/ / |/| | | Unscoped works with other named scope even without block form | ||||
| * | | enhance unscoped tests | Neeraj Singh | 2013-03-23 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Make it obvious that using unscoped with another scope without the block works | ||||
| * | | unscoped works with named scope [ci skip] | Neeraj Singh | 2013-03-23 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | Update comment to reflect that unscoped works with named scope even when named scope is using without block form | ||||
* | | | Review some CHANGELOG entries [ci skip] | Rafael Mendonça França | 2013-03-23 | 1 | -7/+8 |
| | | | |||||
* | | | Merge pull request #9880 from wangjohn/refactoring_attribute_assignment | Rafael Mendonça França | 2013-03-23 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Refactoring validate_missing_parameters to validate_required_parameters. | ||||
| * | | | Refactoring validate_missing_parameters to validate_required_parameters. | wangjohn | 2013-03-23 | 1 | -5/+5 |
| |/ / | |||||
* | | | Autoload the AlterTable class | Rafael Mendonça França | 2013-03-23 | 1 | -0/+1 |
| | | | |||||
* | | | 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 |
|/ / | |||||
* | | 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 |
| | | | | |||||
* | | | | 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 | ||||
* | | | | 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 |
|/ / / | |||||
* / / | 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. | ||||
* | | Allows setting fixture_path to a Pathname | Alexander Murmann and Can Berk Güder | 2013-03-21 | 2 | -1/+10 |
| | | |||||
* | | Adding a bang to method name of raise_on_type_mismatch. | wangjohn | 2013-03-21 | 6 | -8/+8 |
| | | |||||
* | | Merge pull request #9847 from vipulnsward/fix_sqlite_test | Rafael Mendonça França | 2013-03-21 | 1 | -1/+1 |
|\ \ | |/ |/| | 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 | 1 | -1/+1 |
| | | |||||
* | | Update other counter caches on destroy | Ian Young | 2013-03-20 | 11 | -9/+45 |
|/ | |||||
* | use `connect_poll` on pg so that reaping does not hurt the connection | Aaron Patterson | 2013-03-20 | 2 | -3/+4 |
| | |||||
* | Revert "default the reaping frequency to 10 seconds" | Aaron Patterson | 2013-03-20 | 1 | -1/+1 |
| | | | | | | | mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2. | ||||
* | Merge pull request #9833 from choudhuryanupam/fix_active_schema_test | Carlos Antonio da Silva | 2013-03-20 | 1 | -2/+1 |
|\ | | | | | Removed unnecessary block |