aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* unscoped works with named scope [ci skip]Neeraj Singh2013-03-231-8/+0
| | | | | Update comment to reflect that unscoped works with named scope even when named scope is using without block form
* Merge branch 'schema'Aaron Patterson2013-03-2210-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 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
| | | | | 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_testCarlos Antonio da Silva2013-03-221-1/+1
|\ | | | | Removed unused loop variable
| * 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 block
| * | 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 JRuby
| * | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
| |/ /
* | | Don't kill the consoleJon Leighton2013-03-221-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_resetJon Leighton2013-03-221-0/+7
|\ \ \ | | | | | | | | test-case to prevent resetting associations when preloading twice.
| * | | test-case to prevent resetting associations when preloading twice.Yves Senn2013-03-221-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_recordJon Leighton2013-03-224-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 recordDmitry Vorotilin2013-03-224-2/+18
|/ /
* | Send SIGTERM, not SIGQUIT.Jon Leighton2013-03-221-1/+1
| | | | | | | | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761.
* | Delete failing testJon Leighton2013-03-221-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-rubyGuillermo Iguaran2013-03-211-2/+7
|\ | | | | Change Standard error when is required bcrypt-ruby and fails
| * 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
|\ \ | |/ |/| Allow fixture_path to be a Pathname
| * 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.
| * 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 and removing overhead caused by sorting
| * Tidying up some require : removing useless sort and homogenizing with the ↵Intrepidd2013-03-202-6/+3
| | | | | | | | rest of the code the wat the includes are done
* | Merge pull request #9847 from vipulnsward/fix_sqlite_testRafael Mendonça França2013-03-212-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.rbVipul A M2013-03-212-3/+3
| | |
* | | Merge pull request #7706 from iangreenleaf/multiple_counter_cachesJeremy Kemper2013-03-2011-9/+45
|\ \ \ | | | | | | | | Update other counter caches on destroy
| * | | Update other counter caches on destroyIan Young2013-03-2011-9/+45
| |/ /
* | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md
| * | | Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
| | | | | | | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing.
* | | | Merge pull request #9837 from kjg/no_scaffold_css_when_no_assetsGuillermo Iguaran2013-03-203-1/+6
|\ \ \ \ | |_|/ / |/| | | Don't generate a scaffold.css when --no-assets is specified
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:12:49 +0000