aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Ensure correct ordering of results in ↵Raimonds Simanovskis2011-08-301-1/+1
| | | | | | test_update_all_with_joins_and_offset_and_order Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.
* Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracleJon Leighton2011-08-301-1/+7
| | | | Fix test column names are escaped for oracle
* Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ↵Jon Leighton2011-08-291-1/+0
| | | | (and this call to super is no essential, so easiest to simply remove)
* Merge pull request #2021 from dasch/more_postgres_utilsAaron Patterson2011-08-293-16/+21
|\ | | | | Make #extract_schema_and_table an instance method in Utils
| * Make #extract_schema_and_table an instance method in UtilsDaniel Schierbeck2011-07-093-16/+21
| | | | | | | | Also, move the utils test into its own test case.
* | Move clear_timestamp_attributes into Timestamp moduleJon Leighton2011-08-292-10/+14
| |
* | The join_nodes must be passed to the JoinDependency initializer and ↵Jon Leighton2011-08-294-13/+20
| | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.
* | Move the bulk alter table code into the abstract mysql adapter, hence it is ↵Jon Leighton2011-08-293-47/+44
| | | | | | | | supported for mysql2 as well now.
* | Extract simplified_type into the abstract classJon Leighton2011-08-293-23/+24
| |
* | Create an AbstractMysqlAdapter to abstract the common code between ↵Jon Leighton2011-08-295-1117/+726
| | | | | | | | MysqlAdapter and Mysql2Adapter.
* | fixing typoAaron Patterson2011-08-281-1/+1
| |
* | clear and disable query cache when an exception is raised from called middlewareAaron Patterson2011-08-282-1/+33
| |
* | stop messing with the load path, load path should be adjusted in the test taskAaron Patterson2011-08-261-7/+0
| |
* | Force binary data inserted for a string data type to utf-8 and log anAaron Patterson2011-08-252-3/+34
| | | | | | | | | | | | | | | | error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database.
* | Merge pull request #2679 from amatsuda/nullify_abstract_class_table_nameAaron Patterson2011-08-242-0/+6
|\ \ | | | | | | do not compute table names for abstract classes
| * | do not compute table names for abstract classesAkira Matsuda2011-08-242-0/+6
| | |
* | | Adding missing autoloadClaudio Poli2011-08-241-0/+1
|/ /
* | Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251Santiago Pastorino2011-08-221-1/+1
|\ \ | | | | | | Use mysql_creation_options inside rescue block
| * | Use mysql_creation_options inside rescue blockJonathon M. Abbott2011-08-141-1/+1
| | | | | | | | | | | | | | | Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler.
* | | Merge pull request #2600 from al/finder_sql_example_updateXavier Noria2011-08-211-6/+10
|\ \ \ | | | | | | | | Updated the docs for the has_many :finder_sql option
| * | | Updated the docs for the has_many :finder_sql option to reflect changes made ↵Alan Larkin2011-08-201-6/+10
| | | | | | | | | | | | | | | | in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
* | | | Fix PredicateBuilder clobbering select_values in subquery.Ernie Miller2011-08-202-1/+14
| | | |
* | | | Fix assumption of primary key name in PredicateBuilder subquery.Ernie Miller2011-08-202-1/+11
|/ / /
* | | prevent sql injection attacks by escaping quotes in column namesAaron Patterson2011-08-164-3/+20
| | |
* | | In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵Jon Leighton2011-08-163-14/+26
| | | | | | | | | | | | under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
* | | Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"Santiago Pastorino2011-08-161-0/+1
| | | | | | | | | | | | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
* | | Remove unused require.Hendy Tanata2011-08-161-1/+0
| | |
* | | Bump arel dependencyJon Leighton2011-08-151-1/+1
| | |
* | | Use new SelectManager#source methodJon Leighton2011-08-152-2/+2
| | |
* | | Use new SelectManager#projections= methodJon Leighton2011-08-153-4/+4
| | |
* | | use update.key instead of update.ast.key. make better use of select manager.Jon Leighton2011-08-153-26/+18
| | |
* | | Use a SelectCore rather than a full SelectManagerJon Leighton2011-08-152-4/+6
| | |
* | | Refactor building the update managerJon Leighton2011-08-154-16/+13
| | |
* | | Support for multi-table updates with limits, offsets and ordersJon Leighton2011-08-154-2/+77
| | |
* | | Support updates with joins. Fixes #522.Jon Leighton2011-08-155-4/+34
| | |
* | | Ensure empty has_many :through association preloaded via joins is marked as ↵Jon Leighton2011-08-152-3/+10
| | | | | | | | | | | | loaded. Fixes #2054.
* | | Fix private methods which are delegated to. This previously worked because ↵Jon Leighton2011-08-152-13/+13
|/ / | | | | | | Module#delegate previously ignored method visibility.
* | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-132-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
| * | Document exclamation point on dynamic findersFlorent Guilleux2011-08-131-0/+4
| | |
| * | Rubygems => RubyGemsSukeerthi Adiga2011-08-131-1/+1
| | |
| * | Quote these dates to prevent intermittent test failure. Suppose local time ↵Jon Leighton2011-08-132-4/+4
| | | | | | | | | | | | is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
| * | accept option for recreate db for postgres (same as mysql now)artemk2011-08-131-2/+4
| | |
| * | initializing @open_transactions in the initialize methodAaron Patterson2011-08-131-4/+2
| | |
| * | add a migrate class method and delegate to the new instanceAaron Patterson2011-08-131-1/+4
| | |
| * | Ensure that .up and .down work as well.Christopher Meiklejohn2011-08-131-2/+13
| | |
| * | Support backwards compatible interface for migration down/up with rails 3.0.x.Christopher Meiklejohn2011-08-132-0/+25
| | |
| * | remove extra require for 'stringio' as it is required in helper.rbVishnu Atrai2011-08-131-1/+0
| | |
| * | magic comment test only if encoding_aware?.Arun Agrawal2011-08-131-3/+4
| | |
| * | Resolve warnings by instantizing @attrubtes as nilBrian Cardarella2011-08-131-0/+1
| | |
| * | default writing the schema file as utf-8Aaron Patterson2011-08-131-1/+2
| | |