aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1632 from tardate/pg_schema_fuAaron Patterson2011-06-214-50/+285
|\
| * Merge remote branch 'rails/master' into pg_schema_fuPaul Gallagher2011-06-1918-112/+476
| |\
| * | Make PostgreSQL adapter view-compatiblePaul Gallagher2011-06-193-4/+54
| * | make extract_schema_and_table a private methodPaul Gallagher2011-06-112-27/+24
| * | remove table quoting in primary_key methodPaul Gallagher2011-06-113-6/+48
| * | apply private method indentation conventionPaul Gallagher2011-06-103-25/+25
| * | Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-103-27/+173
* | | Merge pull request #1784 from gazay/3-1-stable-shadowing-variablesJosé Valim2011-06-201-1/+1
|\ \ \
| * | | 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-182-1/+13
|\ \ \
| * | | Changed the default value for the options argument on ActiveRecord::Connectio...Grant Neufeld2011-06-182-1/+13
| | |/ | |/|
* / | Fix inconsistencies by being polite to the wrapped body. Needed for Rack::Sen...Steve Hodgkiss2011-06-184-0/+34
|/ /
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-184-13/+15
|\ \
| * | Update remove_index documentationLucia Escanellas2011-06-173-11/+13
| * | Remove trailing whitespacesGuillermo Iguaran2011-06-121-2/+2
| |/
* | Bump to mysql2 0.3.6Guillermo Iguaran2011-06-171-1/+1
* | Add require 'pathname' as it has not already been required in some circumstancesJon Leighton2011-06-171-0/+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 #ta...Ken Collins2011-06-101-0/+1
| |/
* | Perf fix - Use an instance variable instead of a class_attribute. Thanks @jos...Jon Leighton2011-06-161-8/+4
* | 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-134-18/+276
* | Rename tests to reflect associationsAndrew White2011-06-131-30/+30
* | Add support for using an ARCONFIG environment variable to specify the locatio...Jon Leighton2011-06-122-4/+12
* | Oops, this should have been in the last commit :zap:Jon Leighton2011-06-121-1/+1
* | Make assert_no_queries literally enforce that there are no queries. As in, no...Jon Leighton2011-06-122-15/+4
* | If we're going to use a global variable, let's at least namespace itJon Leighton2011-06-122-10/+10
* | Replace inline lambdas with named methodsJon Leighton2011-06-121-29/+42
* | Refactor tests to be less brittleJon Leighton2011-06-123-28/+74
* | Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special c...Jon Leighton2011-06-122-2/+1
* | Don't wrap operations on collection associations in transactions when they ar...benedikt2011-06-122-3/+54
|/
* 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
* Print out information about whether the identity map is on or off when runnin...Jon Leighton2011-06-093-6/+14
* Update the RUNNING_UNIT_TESTS fileJon Leighton2011-06-091-10/+5
* Merge pull request #1591 from smartinez87/unusedJosé Valim2011-06-082-3/+3
|\
| * Remove unused 'y' variable.Sebastian Martinez2011-06-081-2/+2
| * 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 creates...Rodrigo Navarro2011-06-081-1/+0
|/
* Do not hardcode :id as it was ignored by mass assignment filterRaimonds Simanovskis2011-06-081-2/+2
* remove warning: assigned but unused variableSantiago Pastorino2011-06-082-2/+2
* Allow polymorphic has_one to work when the association is set before the owne...Jon Leighton2011-06-082-3/+12
* When you add a record to a polymorphic has_one, you should be able to access ...Jon Leighton2011-06-083-3/+6
* fix typoAlexandr Zykov2011-06-081-1/+1
* This way asserting that updated_at was changed in touch look more obvious.Dmitriy Kiriyenko2011-06-071-0/+1
* Do not use default_scope in ActiveRecord::Persistence#touch.Dmitriy Kiriyenko2011-06-072-1/+10
* Fix a couple of helper requires that were missed. This was causing the tests ...Jon Leighton2011-06-072-2/+2
* Merge pull request #1474 from ganeshkumar/update_column_changesJosé Valim2011-06-071-0/+9
|\