From ddad32978d480235c7b01ae42edc667b45a396cb Mon Sep 17 00:00:00 2001 From: Akshay Vishnoi Date: Sun, 6 Jul 2014 15:23:12 +0530 Subject: [ci skip] /sqlite/i --> SQLite --- actionview/RUNNING_UNIT_TESTS.rdoc | 4 ++-- actionview/test/active_record_unit.rb | 2 +- .../lib/active_record/connection_adapters/abstract/quoting.rb | 2 +- activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 4 ++-- activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | 4 ++-- railties/CHANGELOG.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/actionview/RUNNING_UNIT_TESTS.rdoc b/actionview/RUNNING_UNIT_TESTS.rdoc index c408882827..6c4e5e983a 100644 --- a/actionview/RUNNING_UNIT_TESTS.rdoc +++ b/actionview/RUNNING_UNIT_TESTS.rdoc @@ -19,8 +19,8 @@ which can be further narrowed down to one test: == Dependency on Active Record and database setup Test cases in the test/activerecord/ directory depend on having -activerecord and sqlite installed. If Active Record is not in -actionview/../activerecord directory, or the sqlite rubygem is not installed, +activerecord and sqlite3 installed. If Active Record is not in +actionview/../activerecord directory, or the sqlite3 rubygem is not installed, these tests are skipped. Other tests are runnable from a fresh copy of actionview without any configuration. diff --git a/actionview/test/active_record_unit.rb b/actionview/test/active_record_unit.rb index 95fbb112c0..5b458d9394 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 SQLite 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 bee99e5fc9..7ee22affa8 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 SQLite 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 e6163771e8..c6dd632c12 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -7,7 +7,7 @@ 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] @@ -16,7 +16,7 @@ module ActiveRecord # 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. + # 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 b89caa3d55..4e09779dc1 100644 --- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb @@ -57,7 +57,7 @@ module ActiveRecord end end - # sqlite databases should be able to support any type and not + # 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. @@ -126,7 +126,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 c33a4ed192..5a919fde39 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* -- cgit v1.2.3