From 2f716694f20cd19464029513fb59440fd9000840 Mon Sep 17 00:00:00 2001
From: Zachary Scott <e@zzak.io>
Date: Sun, 6 Jul 2014 11:47:16 -0700
Subject: [PATCH] Change back occurrences of SQLite(3) to sqlite3 when
 referring to the adapter, fixed from #16057 [ci skip]

---
 actionview/test/active_record_unit.rb                 |  2 +-
 .../connection_adapters/abstract/quoting.rb           |  2 +-
 .../connection_adapters/sqlite3_adapter.rb            |  8 ++++----
 .../cases/adapters/sqlite3/sqlite3_adapter_test.rb    | 11 ++++++-----
 railties/CHANGELOG.md                                 |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/actionview/test/active_record_unit.rb b/actionview/test/active_record_unit.rb
index 5b458d9394..cca55c9af4 100644
--- a/actionview/test/active_record_unit.rb
+++ b/actionview/test/active_record_unit.rb
@@ -57,7 +57,7 @@ class ActiveRecordTestConnector
         end
       end
 
-      # Load actionpack SQLite tables
+      # Load actionpack sqlite3 tables
       def load_schema
         File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
           ActiveRecord::Base.connection.execute(sql) unless sql.blank?
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 7ee22affa8..eb88845913 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -56,7 +56,7 @@ module ActiveRecord
       # This works for mysql and mysql2 where table.column can be used to
       # resolve ambiguity.
       #
-      # We override this in the SQLite and PostgreSQL adapters to use only
+      # We override this in the sqlite3 and postgresql adapters to use only
       # the column name (as per syntax requirements).
       def quote_table_name_for_assignment(table, attr)
         quote_table_name("#{table}.#{attr}")
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index c6dd632c12..32fb51d31a 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -7,16 +7,16 @@ require 'sqlite3'
 
 module ActiveRecord
   module ConnectionHandling # :nodoc:
-    # SQLite3 adapter reuses sqlite_connection.
+    # sqlite3 adapter reuses sqlite_connection.
     def sqlite3_connection(config)
       # Require database.
       unless config[:database]
         raise ArgumentError, "No database file specified. Missing argument: database"
       end
 
-      # Allow database path relative to Rails.root, but only if
-      # the database path is not the special path that tells
-      # SQLite to build a database only in memory.
+      # Allow database path relative to Rails.root, but only if the database
+      # path is not the special path that tells sqlite to build a database only
+      # in memory.
       if ':memory:' != config[:database]
         config[:database] = File.expand_path(config[:database], Rails.root) if defined?(Rails.root)
         dirname = File.dirname(config[:database])
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 4e09779dc1..b2bf9480dd 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -57,10 +57,11 @@ module ActiveRecord
         end
       end
 
-      # SQLite databases should be able to support any type and not
-      # just the ones mentioned in the native_database_types.
-      # Therefore test_invalid column should always return true
-      # even if the type is not valid.
+      # sqlite3 databases should be able to support any type and not just the
+      # ones mentioned in the native_database_types.
+      #
+      # Therefore test_invalid column should always return true even if the
+      # type is not valid.
       def test_invalid_column
         assert @conn.valid_type?(:foobar)
       end
@@ -126,7 +127,7 @@ module ActiveRecord
         assert @conn, 'should have connection'
       end
 
-      # SQLite3 defaults to UTF-8 encoding
+      # sqlite3 defaults to UTF-8 encoding
       def test_encoding
         assert_equal 'UTF-8', @conn.encoding
       end
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 5a919fde39..c33a4ed192 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -48,7 +48,7 @@
 
     *Matthew Draper*
 
-*   Remove SQLite3 lines from `.gitignore` if the application is not using SQLite3.
+*   Remove sqlite3 lines from `.gitignore` if the application is not using sqlite3.
 
     *Dmitrii Golub*