Azure-Friendly DB create/drop. Fixes #442

Create allows edition options like:

* MAXSIZE
* EDITION
* SERVICE_OBJECTIVE

Author: metaskills

CHANGELOG.md

@@ -4,6 +4,8 @@
 #### Fixed
 
 * Azure-Friendly Disable Referential Integrity. No more `sp_MSforeachtable` usage. Fixes #421
+* Azure-Friendly DB create/drop. Fixes #442
+  - Create allows edition options like: MAXSIZE, EDITION, and SERVICE_OBJECTIVE.
 
 
 ## v4.2.7

lib/active_record/connection_adapters/sqlserver/database_tasks.rb

@@ -5,17 +5,9 @@ module DatabaseTasks
 
         def create_database(database, options = {})
           name = SQLServer::Utils.extract_identifiers(database)
-          options = {collation: @connection_options[:collation]}.merge!(options.symbolize_keys)
-          options = options.select { |_, v| v.present? }
-          option_string = options.inject("") do |memo, (key, value)|
-            memo += case key
-            when :collation
-              " COLLATE #{value}"
-            else
-              ""
-            end
-          end
-          do_execute "CREATE DATABASE #{name}#{option_string}"
+          db_options = create_database_options(options)
+          edition_options = create_database_edition_options(options)
+          do_execute "CREATE DATABASE #{name} #{db_options} #{edition_options}"
         end
 
         def drop_database(database)
@@ -35,6 +27,38 @@ def collation
           select_value "SELECT DATABASEPROPERTYEX(DB_NAME(), 'Collation')"
         end
 
+
+        private
+
+        def create_database_options(options={})
+          keys  = [:collate]
+          copts = @connection_options
+          options = {
+            collate: copts[:collation]
+          }.merge(options.symbolize_keys).select { |_, v|
+            v.present?
+          }.slice(*keys).map { |k,v|
+            "#{k.to_s.upcase} #{v}"
+          }.join(' ')
+          options
+        end
+
+        def create_database_edition_options(options={})
+          keys  = [:maxsize, :edition, :service_objective]
+          copts = @connection_options
+          edition_options = {
+            maxsize: copts[:azure_maxsize],
+            edition: copts[:azure_edition],
+            service_objective: copts[:azure_service_objective]
+          }.merge(options.symbolize_keys).select { |_, v|
+            v.present?
+          }.slice(*keys).map { |k,v|
+            "#{k.to_s.upcase} = #{v}"
+          }.join(', ')
+          edition_options = "( #{edition_options} )" if edition_options.present?
+          edition_options
+        end
+
       end
     end
   end

test/cases/rake_test_sqlserver.rb

@@ -23,14 +23,24 @@ def disconnect!
   end
 
   def reconnect
-    ActiveRecord::Base.establish_connection(default_configuration)
-    connection.drop_database(new_database) rescue nil
+    config = default_configuration
+    if connection_sqlserver_azure?
+      ActiveRecord::Base.establish_connection(config.merge('database' => 'master'))
+      connection.drop_database(new_database) rescue nil
+      disconnect!
+      ActiveRecord::Base.establish_connection(config)
+    else
+      ActiveRecord::Base.establish_connection(config)
+      connection.drop_database(new_database) rescue nil
+    end
   end
 
 end
 
 class SQLServerRakeCreateTest < SQLServerRakeTest
 
+  self.azure_skip = false
+
   it 'establishes connection to database after create ' do
     db_tasks.create configuration
     connection.current_database.must_equal(new_database)
@@ -56,6 +66,8 @@ class SQLServerRakeCreateTest < SQLServerRakeTest
 
 class SQLServerRakeDropTest < SQLServerRakeTest
 
+  self.azure_skip = false
+
   it 'drops database and uses master' do
     db_tasks.create configuration
     db_tasks.drop configuration

test/config.yml

@@ -20,13 +20,15 @@ connections:
       dataserver: <%= ENV['ACTIVERECORD_UNITTEST_DATASERVER'] %>
       tds_version: <%= ENV['ACTIVERECORD_UNITTEST_TDSVERSION'] %>
       azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
+      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : nil %>
     arunit2:
       <<: *default_connection_info
       database: activerecord_unittest2
       appname: SQLServerAdptrUnit2
       dataserver: <%= ENV['ACTIVERECORD_UNITTEST_DATASERVER'] %>
       tds_version: <%= ENV['ACTIVERECORD_UNITTEST_TDSVERSION'] %>
       azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
+      timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : nil %>
 
   odbc:
     arunit: