Added db:charset support to PostgreSQL. [#556 state:resolved]

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -623,6 +623,19 @@ def columns(table_name, name = nil)
         end
       end
 
+      # Returns the current database name.
+      def current_database
+        query('select current_database()')[0][0]
+      end
+
+      # Returns the current database encoding format.
+      def encoding
+        query(<<-end_sql)[0][0]
+          SELECT pg_encoding_to_char(pg_database.encoding) FROM pg_database
+          WHERE pg_database.datname LIKE '#{current_database}'
+        end_sql
+      end
+
       # Sets the schema search path to a string of comma-separated schema names.
       # Names beginning with $ have to be quoted (e.g. $user => '$user').
       # See: http://www.postgresql.org/docs/current/static/ddl-schemas.html

activerecord/test/cases/adapter_test.rb

@@ -65,6 +65,12 @@ def test_show_nonexistent_variable_returns_nil
     end
   end
 
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_encoding
+      assert_not_nil @connection.encoding
+    end
+  end
+
   def test_table_alias
     def @connection.test_table_alias_length() 10; end
     class << @connection

cleanlogs.sh

-rm activerecord/debug.log activerecord/test/debug.log actionpack/debug.log activeresource/test/debug.log

railties/lib/tasks/databases.rake

@@ -141,6 +141,9 @@ namespace :db do
     when 'mysql'
       ActiveRecord::Base.establish_connection(config)
       puts ActiveRecord::Base.connection.charset
+    when 'postgresql'
+      ActiveRecord::Base.establish_connection(config)
+      puts ActiveRecord::Base.connection.encoding
     else
       puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
     end