TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
36,084 Commits 2 Branches 0 Tags 294 MiB
1231eb80c8
Commit Graph

36084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam Choudhury
1231eb80c8 Refactored test case with standard variable naming 2013-03-08 19:45:20 +05:30
Jon Leighton
be3e10cd26 Fix rails console --sandbox 
I've also added a proper acceptance test which reproduced the issue.

Closes #9513, #9515.
 2013-03-08 13:58:56 +00:00
Rafael Mendonça França
ba6b3c165f Merge pull request #8868 from tehgeekmeister/master 
Use the index name explicitly provided in a migration when reverting.

Fixes #8868

Conflicts:
	activerecord/CHANGELOG.md
 2013-03-08 10:35:16 -03:00
Rafael Mendonça França
22f31214a0 Merge pull request #8966 from cfabianski/disable_prepared_statement_when_preparing_a_query 
Unprepared Visitor + unprepared_statement

Conflicts:
	activerecord/CHANGELOG.md
 2013-03-08 10:19:58 -03:00
Carlos Antonio da Silva
de28157468 Merge pull request #9609 from arunagw/using-latest-arjdbc 
Using latest AR-JDBC for JRuby
 2013-03-08 09:43:10 -03:00
Carlos Antonio da Silva
9588924440 Update test name to reflect change in how scopes merging works 
Introduced in f1082b8588a9144eedb34d511f0074031f692d98.
Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986.

[ci skip]
 2013-03-08 09:34:33 -03:00
Jon Leighton
9f007d7fe5 Write a more comprehensive CHANGELOG message [ci skip] 2013-03-08 10:44:42 +00:00
Jon Leighton
f1082b8588 Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where 
7365 merging scopes for where clauses
 2013-03-08 02:35:06 -08:00
Cédric FABIANSKI
9f549212c3 Unprepared Visitor + unprepared_statement 2013-03-08 09:14:31 +01:00
Ezekiel Smithburg
b6226c3cfb If an index can't be found by column, use the index name. 
schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858.  this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
 2013-03-07 20:03:17 -08:00
Carlos Antonio da Silva
b67043393b Fix warnings 2013-03-07 21:32:51 -03:00
Carlos Antonio da Silva
a4c9538967 Merge pull request #9605 from neerajdotname/sqlite-support-savepoint 
SQLite3 3.6.8+ supports savepoints
 2013-03-07 16:23:15 -08:00
Neeraj Singh
c132841315 SQLite3 3.6.8+ supports savepoints 
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
 2013-03-07 19:03:11 -05:00
Neeraj Singh and John Leighton
cd26b6ae7c Combine scope conditions using AND 
Currently Post.active.inactive will result in Post.inactive since
the last where clause wins when scopes are merged.

This pull request will merge all scopes ( barring defaul scope)
using AND.

The default scope will be overridden if another scope acts on the
same where clause.

closes #7365
 2013-03-07 18:57:27 -05:00
Carlos Antonio da Silva
087ce9d52d Fix hash spaces and use 1.9 style hash [ci skip] 2013-03-07 20:17:30 -03:00
Carlos Antonio da Silva
a049631380 Move AP changelog entry to the top [ci skip] 2013-03-07 20:15:49 -03:00
Rafael Mendonça França
de4a60c9f4 Merge pull request #9464 from jcoyne/assert_template_file 
Allow use of assert_template with the :file option.
 2013-03-07 14:00:39 -08:00
Rafael Mendonça França
c6839277a9 Merge pull request #9597 from senny/9110_serialized_not_null_default 
test case for `serialize` default values.
 2013-03-07 08:31:14 -08:00
Rafael Mendonça França
2e3e171e31 Merge pull request #9105 from bemurphy/cache_key_updated_on 
cache_key consults updated_on timestamp if present

Conflicts:
	activerecord/CHANGELOG.md
 2013-03-07 13:28:46 -03:00
Yves Senn
fa18c61153 test case for serialize default values. 
Closes #9110
 2013-03-07 17:26:35 +01:00
Rafael Mendonça França
d3adfd6d3b Merge pull request #9474 from HonoreDB/master 
More helpful error message when instantiating an abstract class

Conflicts:
	activerecord/CHANGELOG.md
 2013-03-07 13:26:03 -03:00
Rafael Mendonça França
cf09ac380e Merge pull request #9545 from senny/9535_secure_password_blank 
`has_secure_password` is not invalid when assigning empty Strings
 2013-03-07 08:05:05 -08:00
Rafael Mendonça França
7039fdd836 Merge pull request #9595 from senny/remove_non_breaking_spaces 
replace non-breaking spaces with normal spaces [ci skip]
 2013-03-07 07:47:25 -08:00
Rafael Mendonça França
7a32495e60 Merge pull request #9596 from choudhuryanupam/master 
Refactored the code to remove irrelevant lines
 2013-03-07 07:44:02 -08:00
Anupam Choudhury
f15d9bd116 Refactored and removed unnecessary lines in the test case 2013-03-07 20:42:38 +05:30
Yves Senn
239f0d0ffd replace non-breaking spaces with normal spaces [ci skip] 2013-03-07 16:05:32 +01:00
Rafael Mendonça França
173e0e086f Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1a 
It was added because a regression caused by a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca

Closes #9255
 2013-03-07 11:02:49 -03:00
Santiago Pastorino
b956771e82 debugger 1.4.0 works in Ruby 2.0 2013-03-06 18:26:04 -02:00
Rafael Mendonça França
bac37774cf Merge pull request #9586 from robertomiranda/useless_tr 
Change useless tr to gsub
 2013-03-06 12:02:58 -08:00
robertomiranda
482b07643e Change useless tr to gsub 2013-03-06 14:51:29 -05:00
Rafael Mendonça França
a8bc72effb Merge pull request #9538 from senny/remove_structure_dump 
`Connection#structure_dump` is no longer used
 2013-03-06 07:03:04 -08:00
Yves Senn
0a5fdcd5ae rake db:structure:dump warns when mysqldump is not in PATH. 
Closes #9518.

The rake task used to fail silently and left an empty `structure.sql`.
It's confusing for users to get to the root of the problem.
The warning message tells them where to look.
 2013-03-06 15:12:48 +01:00
Yves Senn
854b74242c Connection#structure_dump is no longer used. #9518 
As of ccc6910c we use `mysqldump` to create the `structure.sql`.
The old `#structure_dump` code is still in AR but never used.

I removed all relevant parts from the code-base.
 2013-03-06 15:12:20 +01:00
Rafael Mendonça França
4ce9843251 Merge pull request #9507 from senny/9483_migrations_without_transactions 
Transactions can be turned off per Migration
 2013-03-06 06:05:47 -08:00
Carlos Antonio da Silva
ac13b4d0f6 Merge pull request #9585 from RKushnir/patch-1 
Typo in comment to ActionView::Resolver#find_all
 2013-03-06 05:28:19 -08:00
RKushnir
1ffaa7aef6 Typo in comment to ActionView::Resolver#find_all 2013-03-06 15:20:09 +02:00
Xavier Noria
12f785fdc7 Merge pull request #9581 from senny/9559_changelog_singularizing_singular 
CHANGELOG entry for improved singularizing of singulars.
 2013-03-06 00:33:02 -08:00
Yves Senn
f8b0e54939 CHANGELOG entry for improved singularizing of singulars. 
Closes #9559.

The actual patch was added with #4719
 2013-03-06 08:28:23 +01:00
Carlos Antonio da Silva
ee169329a8 Add missing require to debug helper test 2013-03-05 22:00:10 -03:00
Rafael Mendonça França
8b6e7fa7a0 Merge pull request #9574 from robertomiranda/debug_helper_test 
Add DebugHelperTest
 2013-03-05 14:35:59 -08:00
robertomiranda
8404925788 Add DebugHelperTest 2013-03-05 17:20:02 -05:00
Xavier Noria
cfa9e61b53 Merge pull request #9565 from kennyj/remove_unused_return_value 
Remove unused return value, because collecting_queries_for_explain isn't public API.
 2013-03-05 13:55:36 -08:00
Guillermo Iguaran
9e43ce5a2b Merge pull request #9573 from robertomiranda/useless_gsub 
Use gsub intead of tr when the to_str is longer than the from_str
 2013-03-05 13:15:41 -08:00
robertomiranda
8a189d0104 Use gsub intead of tr when the to_str is longer than the from_str 2013-03-05 16:07:55 -05:00
Vijay Dev
6ea48ebfa6 Merge branch 'master' of github.com:lifo/docrails 2013-03-05 22:51:48 +05:30
kennyj
e9fc2d3397 Remove unused return value, because collecting_queries_for_explain isn't public API. 2013-03-06 00:35:55 +09:00
Yves Senn
b337390889 transactions can be turned off per Migration. 
Closes #9483.

There are SQL Queries that can't run inside a transaction. Since
the Migrator used to wrap all Migrations inside a transaction there
was no way to run these queries within a migration.

This patch adds `self.disable_ddl_transaction!` to the migration to
turn transactions off when necessary.
 2013-03-05 16:12:08 +01:00
Guillermo Iguaran
588f267e71 Merge pull request #9564 from robertomiranda/useless_gsub 
change useless gsub to tr
 2013-03-05 06:45:09 -08:00
robertomiranda
3bf961d7fd change useless gsub to tr 2013-03-05 09:33:42 -05:00
Yves Senn
f1241ef959 transactional migration test-case was broken. 
The cleanup commit a85625d broke the test-case.
The schema was no longer modified so there was no
way to check that the rollback actually happened.
 2013-03-05 14:15:50 +01:00