sql_cmd 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ae28535256cbad4ab450ea06fe4807b593b938548edc13f3edad224174f819
-  data.tar.gz: d6dfe44866a53bbc52d4bc7ebd1caf80d521a8b8ce70a56d7af9dc5bae3bc5cd
+  metadata.gz: 863a0cf5e7a7251818d980f5e2719290d89bab6cc9de33349bcbade454b3e1bf
+  data.tar.gz: 0c1463b9bfdcffc2fdc17e113025d61d6b3f77de525e381f0b28fffcf06fae43
 SHA512:
-  metadata.gz: d89c55abf7b3cf3abc9bc03d4ee15077326054b959af3a22f68e3b0278cd3af23a12dd027521cfc50d036cc888b5d0b515c62089424079bef7c535a9a55bdd82
-  data.tar.gz: dc56ef0c9e56263982497ef965a9108ab0710a10992dcad49a9f67e81bd4f451eeaa41f64e182e0a1ff2d628ef061844e66e0c745842c99225d699ff25193b52
+  metadata.gz: d7236624b3fbac8d3ac37655277535205261d9a75aa9b5147d81d2699c0632b54a4470c0c708b317b36a7cb5fa99e521c4c915df9a5e7f25f4241f26ed580307
+  data.tar.gz: 2c6ef2c7c0f05c9fc7398982c75833e0453f9312649ed4294737e732fab187451d16946710c484437fdba740f6081702d13ecd27c1801e23049dbb09717183cb

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/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,10 +214,12 @@ 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
-      import_security(connection_string, database_name, import_script_path, backup_url, options) unless import_script_path.nil? || [:no_permissions, :export_only].include?(permissions)
+      import_security(connection_string, database_name, import_script_path, backup_url, options) unless database_info['DatabaseNotFound'] || import_script_path.nil? || [:no_permissions, :export_only].include?(permissions)
       SqlCmd.update_sql_compatibility(connection_string, database_name, options['compatibility_level']) if options['compatibility_level']
       apply_recovery_model(connection_string, database_name, options) if options['recovery_model']
       SqlCmd::AlwaysOn.add_to_availability_group(connection_string, database_name, full_backup_method: full_backup_method) if sql_server_settings['AlwaysOnEnabled'] && !options['secondaryreplica'] && !options['skip_always_on']
@@ -560,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/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.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_json_config