diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 44 | ||||
| -rw-r--r-- | activerecord/test/cases/active_schema_test_postgresql.rb | 24 |
3 files changed, 70 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 9ed3579318..682869e585 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* PostgreSQL: create_ and drop_database support. #9042 [ez, pedz, nicksieger] + * Ensure that validates_uniqueness_of works with with_scope. Closes #9235. [nik.wakelin, cavalle] * Partial updates include only unsaved attributes. Off by default; set YourClass.partial_updates = true to enable. [Jeremy Kemper] diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 41024539b2..674e92ee29 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -474,6 +474,50 @@ module ActiveRecord # SCHEMA STATEMENTS ======================================== + def recreate_database(name) #:nodoc: + drop_database(name) + create_database(name) + end + + # Create a new PostgreSQL database. Options include :owner, :template, + # :encoding, :tablespace, and :connection_limit (note that MySQL uses + # :charset while PostgreSQL uses :encoding). + # + # Example: + # create_database config[:database], config + # create_database 'foo_development', :encoding => 'unicode' + def create_database(name, options = {}) + options = options.reverse_merge(:encoding => "utf8") + + option_string = options.symbolize_keys.sum do |key, value| + case key + when :owner + " OWNER = '#{value}'" + when :template + " TEMPLATE = #{value}" + when :encoding + " ENCODING = '#{value}'" + when :tablespace + " TABLESPACE = #{value}" + when :connection_limit + " CONNECTION LIMIT = #{value}" + else + "" + end + end + + execute "CREATE DATABASE #{name}#{option_string}" + end + + # Drops a PostgreSQL database + # + # Example: + # drop_database 'matt_development' + def drop_database(name) #:nodoc: + execute "DROP DATABASE IF EXISTS #{name}" + end + + # Returns the list of all tables in the schema search path or a specified schema. def tables(name = nil) schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',') diff --git a/activerecord/test/cases/active_schema_test_postgresql.rb b/activerecord/test/cases/active_schema_test_postgresql.rb new file mode 100644 index 0000000000..db325e3fb4 --- /dev/null +++ b/activerecord/test/cases/active_schema_test_postgresql.rb @@ -0,0 +1,24 @@ +require 'cases/helper' + +class PostgresqlActiveSchemaTest < Test::Unit::TestCase + def setup + ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do + alias_method :real_execute, :execute + def execute(sql, name = nil) sql end + end + end + + def teardown + ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:alias_method, :execute, :real_execute) + end + + def test_create_database_with_encoding + assert_equal "CREATE DATABASE matt ENCODING = 'utf8'", create_database(:matt) + assert_equal "CREATE DATABASE aimonetti ENCODING = 'latin1'", create_database(:aimonetti, :encoding => :latin1) + end + + private + def method_missing(method_symbol, *arguments) + ActiveRecord::Base.connection.send(method_symbol, *arguments) + end +end |