From 20002850b30a2da97cea8e3f2f019826b123fdb6 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:14:23 -0300
Subject: Removed ON() on distinct comment

---
 .../lib/active_record/connection_adapters/postgresql_adapter.rb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index acc3e9c5e3..b7b4ce655e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -933,7 +933,7 @@ module ActiveRecord
         order_columns.delete_if { |c| c.blank? }
         order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" }
 
-        # Return a DISTINCT ON() clause that's distinct on the columns we want but includes
+        # Return a DISTINCT clause that's distinct on the columns we want but includes
         # all the required columns for the ORDER BY to work properly.
         sql = "DISTINCT ON (#{columns}) #{columns}, "
         sql << order_columns * ', '
-- 
cgit v1.2.3


From 00e9cbd78af42f0661b3538a966710244c40e276 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:22:53 -0300
Subject: Have a more connection specific rdoc for +supports_statement_cache?+

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb   | 4 ++--
 .../lib/active_record/connection_adapters/postgresql_adapter.rb       | 4 ++--
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index c2e75acb9a..4ec31cb6c4 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -208,8 +208,8 @@ module ActiveRecord
         true
       end
 
-      # Returns +true+ when the connection adapter supports prepared statement
-      # caching, otherwise returns +false+
+      # Returns +true+, since this connection adapter supports prepared statement
+      # caching.
       def supports_statement_cache?
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index b7b4ce655e..94cf8d45d6 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -211,8 +211,8 @@ module ActiveRecord
         ADAPTER_NAME
       end
 
-      # Returns +true+ when the connection adapter supports prepared statement
-      # caching, otherwise returns +false+
+      # Returns +true+, since this connection adapter supports prepared statement
+      # caching.
       def supports_statement_cache?
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 9e7f874f4b..7888ef1fe1 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -66,8 +66,8 @@ module ActiveRecord
         sqlite_version >= '3.6.8'
       end
 
-      # Returns +true+ when the connection adapter supports prepared statement
-      # caching, otherwise returns +false+
+      # Returns +true+, since this connection adapter supports prepared statement
+      # caching.
       def supports_statement_cache?
         true
       end
-- 
cgit v1.2.3


From 3d459645c6c2a77b3ff219c22129ed1642f2e882 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:35:53 -0300
Subject: Added missing docs for +support_migrations?+ on some adapters

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb  | 1 +
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 4ec31cb6c4..551f6e23e5 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -214,6 +214,7 @@ module ActiveRecord
         true
       end
 
+      # Does MySQL support migrations?
       def supports_migrations? #:nodoc:
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 7888ef1fe1..9fb537d949 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -72,6 +72,7 @@ module ActiveRecord
         true
       end
 
+      # Does SQLite support migrations?
       def supports_migrations? #:nodoc:
         true
       end
-- 
cgit v1.2.3


From e2656e07b9f9482f19f53054b72167b1bca2e6b7 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:45:46 -0300
Subject: Added missing docs for +supports_primary_key?+ on some adapters

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb  | 1 +
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 551f6e23e5..e01419224b 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -219,6 +219,7 @@ module ActiveRecord
         true
       end
 
+      # Does MySQL support finding primary key on non-Active Record tables?
       def supports_primary_key? #:nodoc:
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 9fb537d949..5d2ebff9a7 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -77,6 +77,7 @@ module ActiveRecord
         true
       end
 
+      # Does SQLite support finding primary key on non-Active Record tables?
       def supports_primary_key? #:nodoc:
         true
       end
-- 
cgit v1.2.3


From 0e2644cde043f1d7126fda0510d9961eb1692403 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:53:02 -0300
Subject: Added missing docs for clear_cache! on adapters

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb      | 1 +
 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 1 +
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb     | 1 +
 3 files changed, 3 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index e01419224b..3318075e9e 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -332,6 +332,7 @@ module ActiveRecord
         rows
       end
 
+      # Clear prepared statement cache.
       def clear_cache!
         @statements.values.each do |cache|
           cache[:stmt].close
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 94cf8d45d6..ba7852192e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -237,6 +237,7 @@ module ActiveRecord
         @local_tz = execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
       end
 
+      # Clear prepared statement cache.
       def clear_cache!
         @statements.each_value do |value|
           @connection.query "DEALLOCATE #{value}"
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 5d2ebff9a7..326f22ce82 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -96,6 +96,7 @@ module ActiveRecord
         @connection.close rescue nil
       end
 
+      # Clear prepared statement cache.
       def clear_cache!
         @statements.clear
       end
-- 
cgit v1.2.3


From 02ee2003a8040e9e8de5f3258f88dfaaade06c27 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 12:59:05 -0300
Subject: Added docs for #disconnect! on adapters

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb    | 2 ++
 .../lib/active_record/connection_adapters/postgresql_adapter.rb        | 3 ++-
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 3318075e9e..5f2e56c9c3 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -310,6 +310,8 @@ module ActiveRecord
         connect
       end
 
+      # Disconnects from the database if already connected. Otherwise, this
+      # method does nothing.
       def disconnect!
         @connection.close rescue nil
       end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index ba7852192e..53ea80cf15 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -276,7 +276,8 @@ module ActiveRecord
         super
       end
 
-      # Close the connection.
+      # Disconnects from the database if already connected. Otherwise, this
+      # method does nothing.
       def disconnect!
         clear_cache!
         @connection.close rescue nil
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 326f22ce82..2ceb62dfc2 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -90,6 +90,8 @@ module ActiveRecord
         sqlite_version >= '3.1.6'
       end
 
+      # Disconnects from the database if already connected. Otherwise, this
+      # method does nothing.
       def disconnect!
         super
         clear_cache!
-- 
cgit v1.2.3


From 1a7737353f5844201e5e02528db494cf18f4d72e Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 22 Apr 2011 19:44:30 -0300
Subject: Added docs for #drop_database on MySQL adapter

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb   | 4 ++++
 .../lib/active_record/connection_adapters/postgresql_adapter.rb       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 5f2e56c9c3..d3efc50072 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -563,6 +563,10 @@ module ActiveRecord
         end
       end
 
+      # Drops a MySQL database.
+      #
+      # Example:
+      #   drop_database 'sebastian_development'
       def drop_database(name) #:nodoc:
         execute "DROP DATABASE IF EXISTS `#{name}`"
       end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 53ea80cf15..9fb3139178 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -643,7 +643,7 @@ module ActiveRecord
         execute "CREATE DATABASE #{quote_table_name(name)}#{option_string}"
       end
 
-      # Drops a PostgreSQL database
+      # Drops a PostgreSQL database.
       #
       # Example:
       #   drop_database 'matt_development'
-- 
cgit v1.2.3


From 2c5023921655e0883ed893a82ce2a647118d83c6 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 23 Apr 2011 00:49:55 +0200
Subject: copy-edits 3d45964

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb  | 2 +-
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index d3efc50072..52903a15fb 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -214,7 +214,7 @@ module ActiveRecord
         true
       end
 
-      # Does MySQL support migrations?
+      # Returns true.
       def supports_migrations? #:nodoc:
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 2ceb62dfc2..c199e11d64 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -72,7 +72,7 @@ module ActiveRecord
         true
       end
 
-      # Does SQLite support migrations?
+      # Returns true.
       def supports_migrations? #:nodoc:
         true
       end
-- 
cgit v1.2.3


From ca2f826f5addfeee2b4d5265e7146ad1ead2e37b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 23 Apr 2011 00:51:43 +0200
Subject: copy-edits e2656e0

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb  | 2 +-
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 52903a15fb..e73ddc9893 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -219,7 +219,7 @@ module ActiveRecord
         true
       end
 
-      # Does MySQL support finding primary key on non-Active Record tables?
+      # Returns true.
       def supports_primary_key? #:nodoc:
         true
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index c199e11d64..ae885c2a5d 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -66,7 +66,7 @@ module ActiveRecord
         sqlite_version >= '3.6.8'
       end
 
-      # Returns +true+, since this connection adapter supports prepared statement
+      # Returns true, since this connection adapter supports prepared statement
       # caching.
       def supports_statement_cache?
         true
@@ -77,7 +77,7 @@ module ActiveRecord
         true
       end
 
-      # Does SQLite support finding primary key on non-Active Record tables?
+      # Returns true.
       def supports_primary_key? #:nodoc:
         true
       end
-- 
cgit v1.2.3


From df70b9dfb23aa05ed7ae7955ff0fb7eec68de9a3 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 23 Apr 2011 00:53:28 +0200
Subject: copy-edits 0e2644c

---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb     | 2 +-
 .../lib/active_record/connection_adapters/postgresql_adapter.rb         | 2 +-
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index e73ddc9893..1270a1292c 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -334,7 +334,7 @@ module ActiveRecord
         rows
       end
 
-      # Clear prepared statement cache.
+      # Clears the prepared statements cache.
       def clear_cache!
         @statements.values.each do |cache|
           cache[:stmt].close
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 9fb3139178..3f70d5d0f7 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -237,7 +237,7 @@ module ActiveRecord
         @local_tz = execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
       end
 
-      # Clear prepared statement cache.
+      # Clears the prepared statements cache.
       def clear_cache!
         @statements.each_value do |value|
           @connection.query "DEALLOCATE #{value}"
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index ae885c2a5d..a9dc756bbb 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -98,7 +98,7 @@ module ActiveRecord
         @connection.close rescue nil
       end
 
-      # Clear prepared statement cache.
+      # Clears the prepared statements cache.
       def clear_cache!
         @statements.clear
       end
-- 
cgit v1.2.3