sql_cmd 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df6d540e8235db2ebe06497947f8be105e7232f040d988378f75996be6624c2
-  data.tar.gz: c2b4f51d378cd9b7372aca4b364270756d3a55640d85110e9999c5f79c52e243
+  metadata.gz: 2026009b040577e9e545648215f0bed077ff75c6b901aeb0144643a07be6262e
+  data.tar.gz: 45656864eaae255a6eb8103605f33e2ec5fd87c3375af4e3750bd935bf32abab
 SHA512:
-  metadata.gz: fa6c6886afc7595a4cdacd0fceeb1dc10aa5ad2edc0f440bcabe634ec1d35978acaee61eae509db8bfe56418d867bfed95a32a1f318362dd3377d6d3b9a5edba
-  data.tar.gz: b233b667fe7e1942efb56bd8a0cf20162f46405f1ff5ab3bd41ddcf768e67064aa57b3934d8aa0fcc197188bc886ab6b596adb61498637da6c9cf4ad10fa2bb5
+  metadata.gz: 05e96b27be968770e656dddcd91e56969c6a4ec71b6deb38e50b352380fe1afed015de25f10e59ba55bb8181a8b39e3bcf65008be731fadb69c22f600e93d115
+  data.tar.gz: 699ebf6a150ff70284d6c3a81ccf2538d7f0965143d8efa253ed6925082ca9032da4e4b9e2c1679f19e2eed3029a7179cdd380a61eb10b8f4bef5e45d4eff3eb

data/lib/optional_dependencies.rb

@@ -3,18 +3,8 @@ module OptionalDepedencies
 
   def load_azure_blob_storage_dependencies
     azure_blob_storage_dependencies = {
-      # 'faraday-excon' => '1.1.0',
-      # 'faraday-net_http' => '1.0.1',
-      # 'faraday-net_http_persistent' => '1.1.0',
-      # 'ruby2_keywords' => '0.0.4',
-      # 'faraday' => '1.4.1',
-      # 'faraday_middleware' => '1.0.0',
-      # 'connection_pool' => '2.2.5'
-      # 'net-http-persistent' => '4.0.1',
-      # 'racc' => '1.5.2',
-      # 'nokogiri' => '1.11.4',
-      'azure/storage/common' => '2.0.2',
-      'azure/storage/blob' => '2.0.1',
+      'azure/storage/common' => '>= 2.0.4',
+      'azure/storage/blob' => '>= 2.0.3',
     }
     load_gem_list(azure_blob_storage_dependencies)
   end
@@ -25,6 +15,6 @@ module OptionalDepedencies
       require current_gem
     end
   rescue Gem::LoadError => e
-    raise Gem::LoadError, "You are using functionality requiring the optional gem dependency '#{e.name}', but the gem is not loaded, or is not using a version matching '#{e.requirement}'."
+    raise Gem::LoadError, "You are using functionality requiring the optional gem dependency '#{e.name}', but the gem is not installed, or is not using a version matching '#{e.requirement}'.\n\n#{e.message}"
   end
 end

data/lib/sql_cmd/always_on.rb

@@ -62,8 +62,10 @@ module SqlCmd
       EasyIO.logger.header 'AlwaysOn Permissions Migration to Replica'
       EasyIO.logger.debug 'Migrating logins to replica...'
       import_script_filename = SqlCmd.export_logins(start_time, primary_connection_string, database_name)
-      EasyIO.logger.info "Importing logins on [#{SqlCmd.connection_string_part(replica_connection_string, :server)}]..."
-      SqlCmd.execute_script_file(replica_connection_string, import_script_filename)
+      unless import_script_filename.nil?
+        EasyIO.logger.info "Importing logins on [#{SqlCmd.connection_string_part(replica_connection_string, :server)}]..."
+        SqlCmd.execute_script_file(replica_connection_string, import_script_filename)
+      end
       EasyIO.logger.debug 'Running database_status script...'
       database_info = SqlCmd::Database.info(connection_string, database_name)
       replica_database_info = SqlCmd::Database.info(replica_connection_string, database_name)
@@ -266,7 +268,7 @@ module SqlCmd
 
     def enabled?(connection_string)
       server_info = SqlCmd.get_sql_server_settings(connection_string)
-      server_info['AvailabilityGroup'].nil? || server_info['SecondaryReplica'].nil?
+      !server_info['AvailabilityGroup'].nil? && !server_info['SecondaryReplica'].nil?
     end
   end
 end

data/lib/sql_cmd/database.rb

@@ -137,7 +137,7 @@ module SqlCmd
       connection_string = SqlCmd.remove_connection_string_part(connection_string, :database)
       sql_server = SqlCmd.connection_string_part(connection_string, :server)
       database_info = info(connection_string, database_name)
-      import_script_path = nil
+      import_script_path = import_security_script_path(start_time, connection_string, database_name, backup_url)
       unless database_info['DatabaseNotFound']
         raise "Failed to restore database: [#{database_name}] on [#{sql_server}]! Database already exists!" unless overwrite || force_restore
         unless options['logonly'] || database_info['state_desc'] != 'ONLINE' || permissions == :no_permissions
@@ -214,6 +214,8 @@ module SqlCmd
           raise "Insufficient free space on #{sql_server} to restore database! Must have greater than #{free_space_threshold}% space remaining after restore." if insufficient_space
         end
 
+        database_backup_types = %w(1 5)
+        drop(connection_string, database_name) if options['drop_before_restoring'] && !database_info['DatabaseNotFound'] && database_backup_types.include?(sql_backup_header['BackupType'])
         run_restore_as_job(connection_string, sql_server_settings, backup_files, database_name, options: options)
         monitor_restore(minimum_restore_date, connection_string, database_name, backup_files, options) unless asynchronous
       end
@@ -477,7 +479,7 @@ module SqlCmd
       end
       failure_message = 'Restore appears to have failed! '
       failure_message += job_status == 'NoJob' ? 'The job could not be found and the restored database is not up to date!' : "The job did not start in time. Check sql job 'Restore: #{database_name}' history on [#{server_name}] for details."
-      raise failure_message + "Restore destination: #{server_name}\\#{database_name}"
+      raise failure_message + "\nRestore destination: #{server_name}\\#{database_name}"
     end
 
     def check_restore_date(start_time, connection_string, database_name, messages = :none, log_only: false)
@@ -535,7 +537,11 @@ module SqlCmd
     end
 
     def apply_recovery_model(connection_string, database_name, options)
-      return if recovery_model_set?(connection_string, database_name, options)
+      if recovery_model_set?(connection_string, database_name, options)
+        EasyIO.logger.info "Recovery model already set to '#{options['recovery_model']}'. No change needed."
+        return
+      end
+      EasyIO.logger.info "Setting recovery model to '#{options['recovery_model']}'..."
       options['recovery_model'] ||= 'FULL'
       options['rollback'] ||= 'ROLLBACK IMMEDIATE' # other options: ROLLBACK AFTER 30, NO_WAIT
       sql_script = "ALTER DATABASE [#{database_name}] SET RECOVERY #{options['recovery_model']} WITH #{options['rollback']}"
@@ -547,6 +553,7 @@ module SqlCmd
           #{'=' * 120}\n"
       EOS
       raise failure_message unless recovery_model_set?(connection_string, database_name, options)
+      EasyIO.logger.info "Recovery model updated to '#{options['recovery_model']}'."
     end
 
     def recovery_model_set?(connection_string, database_name, options)
@@ -555,12 +562,19 @@ module SqlCmd
       SqlCmd.execute_query(connection_string, sql_script, return_type: :scalar, readonly: true) || false
     end
 
-    def export_security(start_time, connection_string, database_name, storage_url = nil, options = {})
+    def import_security_script_path(start_time, connection_string, database_name, storage_url = nil)
       start_time = SqlCmd.unify_start_time(start_time)
       server_name = SqlCmd.connection_string_part(connection_string, :server)
       export_folder = "#{SqlCmd.config['paths']['cache']}/sql_cmd/logins"
       basename_prefix = storage_url.nil? ? "#{EasyFormat::File.windows_friendly_name(server_name)}_" : ''
       import_script_path = "#{export_folder}/#{basename_prefix}#{database_name}_database_permissions_#{EasyTime.yyyymmdd(start_time)}.sql"
+    end
+
+    def export_security(start_time, connection_string, database_name, storage_url = nil, options = {})
+      start_time = SqlCmd.unify_start_time(start_time)
+      server_name = SqlCmd.connection_string_part(connection_string, :server)
+      export_folder = "#{SqlCmd.config['paths']['cache']}/sql_cmd/logins"
+      import_script_path = import_security_script_path(start_time, connection_string, database_name, storage_url)
       if ::File.exist?(import_script_path) && ::File.mtime(import_script_path) > start_time
         content = ::File.read(import_script_path)
         SqlCmd::Azure::AttachedStorage.upload(::File.basename(import_script_path), content, options['storage_account_name'], options['storage_access_key'], storage_url: storage_url) unless storage_url.nil?

data/lib/sql_cmd/query.rb

@@ -245,6 +245,7 @@ module SqlCmd
   def migrate_logins(start_time, source_connection_string, destination_connection_string, database_name)
     start_time = SqlCmd.unify_start_time(start_time)
     import_script_filename = export_logins(start_time, source_connection_string, database_name)
+    return if import_script_filename.nil?
     if ::File.exist?(import_script_filename)
       EasyIO.logger.info "Importing logins on [#{connection_string_part(destination_connection_string, :server)}]..."
       execute_script_file(destination_connection_string, import_script_filename)

data/sql_scripts/Agent/JobRunStatus.sql

@@ -6,7 +6,7 @@ SELECT
     j.name AS job_name,
     ja.start_execution_date,
     ISNULL(last_executed_step_id,0)+1 AS current_executed_step_id,
-    Js.step_name
+    js.step_name
 FROM msdb.dbo.sysjobactivity ja
 LEFT JOIN msdb.dbo.sysjobhistory jh
     ON ja.job_history_id = jh.instance_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_cmd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_json_config