diff options
author | Zachary Scott <e@zzak.io> | 2014-07-06 11:41:31 -0700 |
---|---|---|
committer | Zachary Scott <e@zzak.io> | 2014-07-06 11:41:31 -0700 |
commit | 2cda0aff3051bd84c5f3596174cf4d7f1999050a (patch) | |
tree | d51d9c251182ade892991a169f049ee38b741288 /activerecord | |
parent | faf7e39744ee1adf0e581ed0278234173c5bd771 (diff) | |
parent | ddad32978d480235c7b01ae42edc667b45a396cb (diff) | |
download | rails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.tar.gz rails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.tar.bz2 rails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.zip |
Merge pull request #16057 from akshay-vishnoi/doc_change
[ci skip] /sqlite/i --> SQLite
Diffstat (limited to 'activerecord')
3 files changed, 5 insertions, 5 deletions
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 |