aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-11-08 03:37:16 +0000
committerMarcel Molina <marcel@vernix.org>2007-11-08 03:37:16 +0000
commit7143d80147ea26c66dfa1dd4bb82f066d72f6570 (patch)
tree066af9459361f182fa25786b99e44fcb7415941d /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
parent709dc33c927652cc5ffb5758811e036336c95038 (diff)
downloadrails-7143d80147ea26c66dfa1dd4bb82f066d72f6570.tar.gz
rails-7143d80147ea26c66dfa1dd4bb82f066d72f6570.tar.bz2
rails-7143d80147ea26c66dfa1dd4bb82f066d72f6570.zip
Smattering of grammatical fixes to documentation. Closes #10083 [BobSilva]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index bf8fed1111..64f314a7f6 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -18,7 +18,7 @@ module ActiveRecord
raise ArgumentError, "No database specified. Missing argument: database."
end
- # The postgres drivers don't allow to create an unconnected PGconn object,
+ # The postgres drivers don't allow the creation of an unconnected PGconn object,
# so just pass a nil connection object for the time being.
ConnectionAdapters::PostgreSQLAdapter.new(nil, logger, [host, port, nil, nil, database, username, password], config)
end
@@ -217,8 +217,8 @@ module ActiveRecord
# * <tt>:password</tt> -- Defaults to nothing
# * <tt>:database</tt> -- The name of the database. No default, must be provided.
# * <tt>:schema_search_path</tt> -- An optional schema search path for the connection given as a string of comma-separated schema names. This is backward-compatible with the :schema_order option.
- # * <tt>:encoding</tt> -- An optional client encoding that is using in a SET client_encoding TO <encoding> call on connection.
- # * <tt>:min_messages</tt> -- An optional client min messages that is using in a SET client_min_messages TO <min_messages> call on connection.
+ # * <tt>:encoding</tt> -- An optional client encoding that is used in a SET client_encoding TO <encoding> call on the connection.
+ # * <tt>:min_messages</tt> -- An optional client min messages that is used in a SET client_min_messages TO <min_messages> call on the connection.
# * <tt>:allow_concurrency</tt> -- If true, use async query methods so Ruby threads don't deadlock; otherwise, use blocking query methods.
class PostgreSQLAdapter < AbstractAdapter
# Returns 'PostgreSQL' as adapter name for identification purposes.
@@ -398,7 +398,7 @@ module ActiveRecord
end
end
- # Executes a SQL statement, returning a PGresult object on success
+ # Executes an SQL statement, returning a PGresult object on success
# or raising a PGError exception otherwise.
def execute(sql, name = nil)
log(sql, name) do
@@ -478,7 +478,7 @@ module ActiveRecord
# Returns the list of all column definitions for a table.
def columns(table_name, name = nil)
- # Limit, precision, and scale are all handled by superclass.
+ # Limit, precision, and scale are all handled by the superclass.
column_definitions(table_name).collect do |name, type, default, notnull|
PostgreSQLColumn.new(name, default, type, notnull == 'f')
end
@@ -669,7 +669,7 @@ module ActiveRecord
sql << order_columns * ', '
end
- # Returns a ORDER BY clause for the passed order option.
+ # Returns an ORDER BY clause for the passed order option.
#
# PostgreSQL does not allow arbitrary ordering when using DISTINCT ON, so we work around this
# by wrapping the sql as a sub-select and ordering in that query.
@@ -761,7 +761,7 @@ module ActiveRecord
end
# Executes a SELECT query and returns the results, performing any data type
- # conversions that require to be performed here instead of in PostgreSQLColumn.
+ # conversions that are required to be performed here instead of in PostgreSQLColumn.
def select(sql, name = nil)
fields, rows = select_raw(sql, name)
result = []
@@ -791,7 +791,7 @@ module ActiveRecord
# fields that call value_before_type_cast.
if res.type(cell_index) == MONEY_COLUMN_TYPE_OID
# Because money output is formatted according to the locale, there are two
- # cases to consider (note the decimal seperators):
+ # cases to consider (note the decimal separators):
# (1) $12,345,678.12
# (2) $12.345.678,12
case column = row[cell_index]