aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1848 from raviolicode/postgresql_order_multiple_paramsSantiago Pastorino2011-06-241-1/+1
|\ | | | | Fix for complex ordering of multiple columns on postgresql
| * Improve ordering of multiple columns on postgresqlLucia Escanellas2011-06-241-1/+1
| | | | | | | | | | * Only on postgresql, order("first asc, second asc") was invalid * Closes #1720
* | Apply the default scope earlier when doing calculations. Fixes #1682.Jon Leighton2011-06-231-5/+11
|/
* Update SQL Server db related rake tasks.Ken Collins2011-06-231-6/+7
| | | | | | * Uses open source smoscript since scptxfr came out in 2000. * Uses sqlcmd which replaces osql. * Takes advantage of host/user/pass passed down by TinyTDS.
* Merge pull request #1790 from ernie/reverse_sql_order_fixAaron Patterson2011-06-221-3/+12
|\ | | | | Support reversal of ARel orderings in reverse_sql_order
| * Support reversal of ARel orderings in reverse_sql_orderErnie Miller2011-06-201-3/+12
| |
* | Merge pull request #1632 from tardate/pg_schema_fuAaron Patterson2011-06-211-47/+72
|\ \ | |/ |/| Improving PostgreSQL adapter schema-awareness
| * Merge remote branch 'rails/master' into pg_schema_fuPaul Gallagher2011-06-1910-69/+99
| |\
| * | Make PostgreSQL adapter view-compatiblePaul Gallagher2011-06-191-3/+5
| | | | | | | | | * amongst other things, allows meta_search to run against view-backed models
| * | make extract_schema_and_table a private methodPaul Gallagher2011-06-111-20/+17
| | |
| * | remove table quoting in primary_key methodPaul Gallagher2011-06-111-1/+1
| | | | | | | | | * add/cleanup tests
| * | apply private method indentation conventionPaul Gallagher2011-06-101-22/+22
| | | | | | | | | * tidy test code and fix my typo
| * | Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-101-25/+51
| | | | | | | | | | | | | | | | | | | | | * table_exists? scoped by schema search path unless schema is explicitly named. Added tests and doc to clarify the behaviour * extract_schema_and_table tests and implementation extended to cover all cases * primary_key does not ignore schema information * add current_schema and schema_exists? methods * more robust table referencing in insert_sql and sql_for_insert methods
* | | Merge pull request #1784 from gazay/3-1-stable-shadowing-variablesJosé Valim2011-06-201-1/+1
|\ \ \ | | | | | | | | Removing shadowing outer local variables warnings
| * | | Removed shadowing variable warning in activerecord railtiesAlexey Gaziev2011-06-201-1/+1
| | | |
* | | | Add missing require 'set'Daniel Azuma2011-06-201-0/+2
|/ / /
* | | Merge pull request #1763 from grantneufeld/schema_column_exists_options_hashJosé Valim2011-06-181-1/+1
|\ \ \ | | | | | | | | Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
| * | | Changed the default value for the options argument on ↵Grant Neufeld2011-06-181-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}. That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash. When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.
* / | Fix inconsistencies by being polite to the wrapped body. Needed for ↵Steve Hodgkiss2011-06-182-0/+16
|/ / | | | | | | Rack::Sendfile to function properly. See issue #1761.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-184-13/+15
|\ \
| * | Update remove_index documentationLucia Escanellas2011-06-173-11/+13
| | | | | | | | | | | | | | | * Changes should better reflect present code behavior * Related to issue: https://github.com/rails/rails/issues/1624
| * | Remove trailing whitespacesGuillermo Iguaran2011-06-121-2/+2
| |/
* | Bump to mysql2 0.3.6Guillermo Iguaran2011-06-171-1/+1
| |
* | Merge pull request #1636 from metaskills/upstream/3-1-stableAaron Patterson2011-06-171-0/+1
|\ \ | | | | | | Allow the connection pool's #table_exists? method to give the connections
| * | Allow the connection pool's #table_exists? method to give the connections ↵Ken Collins2011-06-101-0/+1
| |/ | | | | | | #table_exists? method a chance.
* | Perf fix - Use an instance variable instead of a class_attribute. Thanks ↵Jon Leighton2011-06-161-8/+4
| | | | | | | | @josevalim and @jhawthorn for the prompting.
* | Bump mysql2 to 0.3.5Arun Agrawal2011-06-161-1/+1
| |
* | Bump mysql2 upSantiago Pastorino and José Ignacio Costa2011-06-161-1/+1
| |
* | Pass mass-assignment options to nested models - closes #1673.Andrew White2011-06-132-16/+25
| |
* | Make assert_no_queries literally enforce that there are no queries. As in, ↵Jon Leighton2011-06-121-0/+4
| | | | | | | | not a single line of SQL should be sent to the database, not even stuff that is ignored by assert_queries. The argument being that if you write assert_no_queries, you really do not want there to be any queries.
* | If we're going to use a global variable, let's at least namespace itJon Leighton2011-06-121-6/+6
| |
* | Replace inline lambdas with named methodsJon Leighton2011-06-121-29/+42
| |
* | Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special ↵Jon Leighton2011-06-121-1/+0
| | | | | | | | case in assert_queries
* | Don't wrap operations on collection associations in transactions when they ↵benedikt2011-06-121-3/+9
|/ | | | are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database.
* Ensure engine migrations are copied in the same sequence that they are required.Brian Quinn2011-06-101-1/+1
|
* don't reinitialize the arel_table unless the table_name changesDamien Mathieu2011-06-091-1/+2
|
* Merge pull request #1591 from smartinez87/unusedJosé Valim2011-06-081-1/+1
|\ | | | | Fix "warning: assigned but unused variable" on AR tests
| * Remove unused 'quoted_column_names' variable.Sebastian Martinez2011-06-081-1/+1
| |
* | No need to create a new Arel::Table, as the arel_table method already ↵Rodrigo Navarro2011-06-081-1/+0
|/ | | | creates a new one
* remove warning: assigned but unused variableSantiago Pastorino2011-06-082-2/+2
|
* Allow polymorphic has_one to work when the association is set before the ↵Jon Leighton2011-06-081-3/+1
| | | | owner has been saved. Fixes #1524.
* When you add a record to a polymorphic has_one, you should be able to access ↵Jon Leighton2011-06-082-2/+2
| | | | the owner from the associated record
* Do not use default_scope in ActiveRecord::Persistence#touch.Dmitriy Kiriyenko2011-06-071-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-065-13/+13
|\ | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * comment the recorder methodsVijay Dev2011-06-071-3/+3
| |
| * up and down are no longer class methods in a migrationVijay Dev2011-06-071-1/+1
| |
| * Remove trailing white-spacesGuillermo Iguaran2011-06-051-1/+1
| |
| * styling changesVijay Dev2011-06-021-3/+3
| |
| * Edited activerecord/lib/active_record/transactions.rb via GitHubAyose2011-06-011-1/+1
| |
| * The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no longer ↵Ayose2011-06-011-1/+1
| | | | | | | | available