kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Added encoding and min_messages options for PostgreSQL #1205 [shugo]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1255 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-04-30 13:21:47 +00:00
parent 90b08c5b92
commit 9ede45f60f
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activerecord/CHANGELOG
View file

@ -1,5 +1,16 @@
*SVN* *SVN*
* Added encoding and min_messages options for PostgreSQL #1205 [shugo]. Configuration example:
development:
adapter: postgresql
database: rails_development
host: localhost
username: postgres
password:
encoding: UTF8
min_messages: ERROR
* Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 [Jamis Buck] * Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 [Jamis Buck]
* Added validates_exclusion_of as a negative of validates_inclusion_of * Added validates_exclusion_of as a negative of validates_inclusion_of

6
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View file

@ -25,6 +25,8 @@ module ActiveRecord
password = config[:password].to_s password = config[:password].to_s
schema_order = config[:schema_order] schema_order = config[:schema_order]
encoding = config[:encoding]
min_messages = config[:min_messages]
if config.has_key?(:database) if config.has_key?(:database)
database = config[:database] database = config[:database]
@ -37,6 +39,8 @@ module ActiveRecord
) )
pga.execute("SET search_path TO #{schema_order}") if schema_order pga.execute("SET search_path TO #{schema_order}") if schema_order
pga.execute("SET client_encoding TO '#{encoding}'") if encoding
pga.execute("SET client_min_messages TO '#{min_messages}'") if min_messages
pga pga
end end
@ -54,6 +58,8 @@ module ActiveRecord
# * <tt>:password</tt> -- Defaults to nothing # * <tt>:password</tt> -- Defaults to nothing
# * <tt>:database</tt> -- The name of the database. No default, must be provided. # * <tt>:database</tt> -- The name of the database. No default, must be provided.
# * <tt>:schema_order</tt> -- An optional schema order string that is using in a SET search_path TO <schema_order> call on connection. # * <tt>:schema_order</tt> -- An optional schema order string that is using in a SET search_path TO <schema_order> call on connection.
# * <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.
class PostgreSQLAdapter < AbstractAdapter class PostgreSQLAdapter < AbstractAdapter
def select_all(sql, name = nil) def select_all(sql, name = nil)
select(sql, name) select(sql, name)