github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,877 Commits 34 Branches 105 Tags
fddf7ea1c1e520f33fa26fe340f3fc107bcc95c8
Commit Graph

5150 Commits

Author SHA1 Message Date
Aaron Patterson
6f3c6992c5 * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731 2011-09-01 15:08:19 -07:00
Aaron Patterson
8b9ddbd8f9 make sure encoding_aware? is available 2011-09-01 14:07:07 -07:00
Joshua Wehner
0df27c98d9 Fixes bug in ActiveRecord::QueryMethods, #1697 
Replace split on comma with a regexp that will reverse all ASC/DESC specifically
 2011-08-31 16:17:28 -04:00
Jon Leighton
92619e4f78 Fix test failures on 1.8.7, since Object#initialize_dup is not defined there (and this call to super is no essential, so easiest to simply remove) 2011-08-29 23:05:26 +01:00
Aaron Patterson
cebff6d0f7 Merge pull request #2021 from dasch/more_postgres_utils 
Make #extract_schema_and_table an instance method in Utils
 2011-08-29 13:38:10 -07:00
Jon Leighton
c59c9bb8bc Move clear_timestamp_attributes into Timestamp module 2011-08-29 17:39:09 +01:00
Jon Leighton
735d985b01 The join_nodes must be passed to the JoinDependency initializer and 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. 2011-08-29 15:05:47 +01:00
Jon Leighton
fd22d040fe Move the bulk alter table code into the abstract mysql adapter, hence it is supported for mysql2 as well now. 2011-08-29 12:43:39 +01:00
Jon Leighton
4fcd847c8d Extract simplified_type into the abstract class 2011-08-29 12:43:39 +01:00
Jon Leighton
5766539342 Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapter and Mysql2Adapter. 2011-08-29 12:43:39 +01:00
Aaron Patterson
b4ff82a791 clear and disable query cache when an exception is raised from called middleware 2011-08-28 14:16:00 -07:00
Aaron Patterson
e8b525f169 stop messing with the load path, load path should be adjusted in the test task 2011-08-26 10:15:17 -07:00
Aaron Patterson
42a7979cf1 Force binary data inserted for a string data type to utf-8 and log an 
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.
 2011-08-25 16:07:54 -07:00
Aaron Patterson
5345958b3a Merge pull request #2679 from amatsuda/nullify_abstract_class_table_name 
do not compute table names for abstract classes
 2011-08-24 16:05:24 -07:00
Claudio Poli
098cc186c1 Adding missing autoload 2011-08-24 19:15:49 +02:00
Akira Matsuda
0a0da9d554 do not compute table names for abstract classes 2011-08-24 21:11:15 +09:00
Santiago Pastorino
0942879a52 Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 
Use mysql_creation_options inside rescue block
 2011-08-22 10:36:12 -07:00
Xavier Noria
74b57b387f Merge pull request #2600 from al/finder_sql_example_update 
Updated the docs for the has_many :finder_sql option
 2011-08-21 04:36:12 -07:00
Alan Larkin
dbe9a9b482 Updated the docs for the has_many :finder_sql option to reflect changes made in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required. 2011-08-20 19:42:07 +01:00
Ernie Miller
f74f5f7f00 Fix PredicateBuilder clobbering select_values in subquery. 2011-08-20 13:16:39 -04:00
Ernie Miller
e2ae015952 Fix assumption of primary key name in PredicateBuilder subquery. 2011-08-20 13:00:26 -04:00
Aaron Patterson
8a39f411dc prevent sql injection attacks by escaping quotes in column names 2011-08-16 15:24:42 -07:00
Jon Leighton
0d5a6f68df In 1efd88283e, ConnectionAdapters was put 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. 2011-08-16 16:40:16 +01:00
Jon Leighton
c3dcb795f1 Use new SelectManager#source method 2011-08-15 23:10:16 +01:00
Jon Leighton
cc206a3507 Use new SelectManager#projections= method 2011-08-15 23:10:16 +01:00
Jon Leighton
12aaad0848 use update.key instead of update.ast.key. make better use of select manager. 2011-08-15 23:10:16 +01:00
Jon Leighton
8778c82e32 Use a SelectCore rather than a full SelectManager 2011-08-15 23:10:15 +01:00
Jon Leighton
fe0ec85541 Refactor building the update manager 2011-08-15 23:10:15 +01:00
Jon Leighton
43b99f290a Support for multi-table updates with limits, offsets and orders 2011-08-15 23:10:15 +01:00
Jon Leighton
128d006242 Support updates with joins. Fixes #522. 2011-08-15 23:10:15 +01:00
Jon Leighton
57423d815b Ensure empty has_many :through association preloaded via joins is marked as loaded. Fixes #2054. 2011-08-15 16:01:01 +01:00
Jon Leighton
7b56fb034a Fix private methods which are delegated to. This previously worked because Module#delegate previously ignored method visibility. 2011-08-15 12:38:44 +01:00
Jonathon M. Abbott
4bb7abcb77 Use mysql_creation_options inside rescue block 
Commit ecd37084b2 did not take into account the use of
creation_options inside the access denied exception handler.
 2011-08-14 22:09:42 +10:00
Xavier Noria
bf2b9d2de3 Merge branch 'master' of github.com:lifo/docrails 
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
 2011-08-13 16:30:07 -07:00
Florent Guilleux
56efdbc626 Document exclamation point on dynamic finders 2011-08-13 16:22:34 -07:00
artemk
bb72183bca accept option for recreate db for postgres (same as mysql now) 2011-08-13 16:22:28 -07:00
Aaron Patterson
1ff52cbe81 initializing @open_transactions in the initialize method 2011-08-13 16:22:28 -07:00
Aaron Patterson
d6af6fc0c0 add a migrate class method and delegate to the new instance 2011-08-13 16:22:27 -07:00
Christopher Meiklejohn
9d19bae233 Support backwards compatible interface for migration down/up with rails 3.0.x. 2011-08-13 16:22:27 -07:00
Aaron Patterson
4a74493816 default writing the schema file as utf-8 2011-08-13 16:22:24 -07:00
Aaron Patterson
17a66a8ddc dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592 2011-08-13 16:22:24 -07:00
Jon Leighton
bec5977932 Revert "Merge pull request #2309 from smasry/master" 
This reverts commit 9d396ee819, reversing
changes made to fa2bfd832c.

Reason: the change broke the build.
 2011-08-13 16:22:22 -07:00
Samer Masry
c751bb1ac2 Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 2011-08-13 16:22:20 -07:00
Dmitriy Kiriyenko
4c873cbf36 Fixed failing query when performing calculation with having based on select. 2011-08-13 16:22:20 -07:00
Jon Leighton
05f1a9bcc3 Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. 2011-08-13 16:22:20 -07:00
Vishnu Atrai
5a92c6627e remove deprication warning for ruby 1.9.3-head for unused variables 2011-08-13 16:22:17 -07:00
Piotr Sarnacki
182a428418 Revert "allow select to have multiple arguments" 
This reverts commit 04cc446d17.

I reverted it because apparently we want to use: select([:a, :b])
instead of select(:a, :b), but there was no tests for that form.
 2011-08-13 16:22:17 -07:00
Sławosz Sławiński
e7f7439d06 allow select to have multiple arguments 2011-08-13 16:22:16 -07:00
Xavier Noria
b537595665 Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms" 
Reason: The hash form is secure, and preferred over the array form if possible.

This reverts commit 6dc749596c.
 2011-08-13 16:22:15 -07:00
Vijay Dev
7372e9ae9a make the warning clear about the effect of using validates_associated on both sides on an association. 2011-08-13 16:22:11 -07:00