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 | 1 | -2/+2 |
|\ \ | | | | | | | | | | Closes #9184 | ||||
| * | | Fix regex to strip quotations from hstore values | jlxw | 2013-03-23 | 1 | -2/+2 |
| | | | | | | | | | | | | 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 | 4 | -4/+31 |
|\ \ \ | |/ / |/| | | | | | | | | Custom index type support with :using. Closes #9451 | ||||
| * | | Custom index type support with :using. | doabit | 2013-03-24 | 4 | -4/+31 |
| | | | |||||
* | | | Merge pull request #9889 from neerajdotname/unscoped | Rafael Mendonça França | 2013-03-23 | 1 | -8/+0 |
|\ \ \ | |/ / |/| | | Unscoped works with other named scope even without block form | ||||
| * | | 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 | ||||
* | | | 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 |
|/ / | |||||
* | | add uuid primary key support | Aaron Patterson | 2013-03-22 | 4 | -3/+20 |
| | | |||||
* | | 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 | 2 | -8/+8 |
| | | |||||
* | | 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 | 2 | -21/+43 |
| | | |||||
* | | When we pass id to update_attributes it will try to set new id for that record | Dmitry Vorotilin | 2013-03-22 | 2 | -2/+2 |
| | | |||||
* | | Allows setting fixture_path to a Pathname | Alexander Murmann and Can Berk Güder | 2013-03-21 | 1 | -1/+1 |
| | | |||||
* | | Adding a bang to method name of raise_on_type_mismatch. | wangjohn | 2013-03-21 | 6 | -8/+8 |
|/ | |||||
* | Update other counter caches on destroy | Ian Young | 2013-03-20 | 4 | -2/+17 |
| | |||||
* | 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. | ||||
* | Properly named variable inside block | Anupam Choudhury | 2013-03-20 | 1 | -2/+2 |
| | | | | Closes #9824. | ||||
* | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | Vipul A M | 2013-03-20 | 2 | -2/+2 |
| | |||||
* | Changed the call to .sort.last to .max when computing the migration version. You | wangjohn | 2013-03-19 | 1 | -1/+1 |
| | | | | | do not actually need to sort everything (incurs more cost than just a simple max). | ||||
* | Calling find() on an association with an inverse will now check to see | wangjohn | 2013-03-19 | 1 | -2/+3 |
| | | | | | if the association already holds that record in memory before checking the database for the specified ids. | ||||
* | Revert "Merge pull request #9784 from ↵ | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 |
| | | | | | | | | | | vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces. | ||||
* | Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 |
|\ | | | | | Change from blank? to empty? on obvious string values to save extra calls | ||||
| * | change from blank? to empty? on obvious string values to save extra method ↵ | Vipul A M | 2013-03-19 | 1 | -4/+4 |
| | | | | | | | | calls | ||||
* | | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 1 | -1/+1 |
|\ \ | | | | | | | Change from each to each_value;drop assignment in habtm | ||||
| * | | 1. Change from each to each_value since we did not use key | Vipul A M | 2013-03-19 | 1 | -1/+1 |
| |/ | | | | | | | 2. drop assignment of value to sum in test | ||||
* | | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1 | Steve Klabnik | 2013-03-18 | 4 | -4/+4 |
|\ \ | | | | | | | fix typos in AR. lots of them. | ||||
| * | | fix typos in AR. lots of them. | Vipul A M | 2013-03-19 | 4 | -4/+4 |
| |/ | |||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] | ||||
| * | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9677 from neerajdotname/update-comments-about-kotori | Carlos Antonio da Silva | 2013-03-18 | 1 | -1/+1 |
|\ \ | | | | | | | SQLite3 3.6.8+ supports nested transactions [ci skip] | ||||
| * | | SQLite3 3.6.8+ supports nested transactions [ci skip] | Neeraj Singh | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132 |