sql_cmd 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266298d96407b2fb372453d3989ef5fb21047f1a364c857c3c559e1826257d5a
-  data.tar.gz: b3053a685e3e0202e1b68bddb20cec62bce549f6d7a8f7164ead4709f355dd9a
+  metadata.gz: 84ae28535256cbad4ab450ea06fe4807b593b938548edc13f3edad224174f819
+  data.tar.gz: d6dfe44866a53bbc52d4bc7ebd1caf80d521a8b8ce70a56d7af9dc5bae3bc5cd
 SHA512:
-  metadata.gz: 99aab9a7af85a77a7da945aaff55823364b497ef4d91d2551994362d87120c379784b8ff753d4339ac44ca91d14ba1c02f17f07942c03646f956c5c9da609190
-  data.tar.gz: 5c6b0287eb928e2356e99b329eee771f5add55af0b13d0ec29e131fee1ab1590c7c726dcfd280d25b96e753b5febc8626841c844e4ae1f122468b8270d19e923
+  metadata.gz: d89c55abf7b3cf3abc9bc03d4ee15077326054b959af3a22f68e3b0278cd3af23a12dd027521cfc50d036cc888b5d0b515c62089424079bef7c535a9a55bdd82
+  data.tar.gz: dc56ef0c9e56263982497ef965a9108ab0710a10992dcad49a9f67e81bd4f451eeaa41f64e182e0a1ff2d628ef061844e66e0c745842c99225d699ff25193b52

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)
@@ -263,5 +265,10 @@ module SqlCmd
       raise 'Failed to remove database from AlwaysOn Availability Group' unless database_info['AvailabilityGroup'].nil? && replica_database_info['AvailabilityGroup'].nil?
       EasyIO.logger.info "[#{database_name}] removed from AlwaysOn availability group successfully..."
     end
+
+    def enabled?(connection_string)
+      server_info = SqlCmd.get_sql_server_settings(connection_string)
+      !server_info['AvailabilityGroup'].nil? && !server_info['SecondaryReplica'].nil?
+    end
   end
 end

data/lib/sql_cmd/backups.rb

@@ -54,22 +54,27 @@ module SqlCmd
     files.map { |f, properties| ["#{base_url}/#{f}", properties[:last_modified]] }.to_h
   end
 
-  def backup_location_and_basename(start_time, connection_string, database_name, options = {}, backup_url: nil)
+  def backup_location_and_basename(start_time, connection_string, database_name, options = {}, backup_folder: nil, backup_url: nil, backup_basename: nil)
     start_time = SqlCmd.unify_start_time(start_time)
     database_info = SqlCmd::Database.info(connection_string, database_name)
     server_settings = get_sql_server_settings(connection_string)
     backup_type = backup_url.nil? || backup_url.empty? ? 'DISK' : 'URL'
     if database_info['DatabaseNotFound']
-      backup_name = "#{database_name}_#{EasyTime.yyyymmdd(start_time)}"
-      return [backup_url, backup_name] if backup_type == 'URL'
+      backup_basename = "#{database_name}_#{EasyTime.yyyymmdd(start_time)}"
+      return [backup_url, backup_basename] if backup_type == 'URL'
       backup_unc_location = SqlCmd.config['sql_cmd']['backups']['backup_to_host_sql_server'] ? "\\\\#{server_settings['ServerName']}\\#{SqlCmd.config['sql_cmd']['backups']['default_backup_share']}" : SqlCmd.config['sql_cmd']['backups']['default_destination']
-      return Dir.glob("#{backup_unc_location}/#{backup_name}*".tr('\\', '/')).empty? ? [nil, nil] : [backup_unc_location, backup_name]
+      return Dir.glob("#{backup_unc_location}/#{backup_basename}*".tr('\\', '/')).empty? ? [nil, nil] : [backup_unc_location, backup_basename]
     end
 
     backup_file_path = database_info['BackupFileLocation']
+    if backup_file_path =~ /^\{.*\}$/
+      backup_basename ||= "#{database_name}_#{EasyTime.yyyymmdd(start_time)}"
+      backup_files, backup_basename = SqlCmd::Database.existing_backup_files(server_settings, options, backup_folder: backup_folder, backup_url: backup_url, backup_basename: backup_basename, log_only: options['logonly'])
+      backup_file_path = backup_files.first
+    end
     backup_file = ::File.basename(backup_file_path)
-    backup_name = backup_basename(backup_file)
-    return [nil, backup_name] if backup_type == 'URL'
+    backup_basename = backup_basename_from_path(backup_file)
+    return [nil, backup_basename] if backup_type == 'URL'
     backup_unc_location = to_unc_path(::File.dirname(backup_file_path), server_settings['ServerName'])
     backup_folder = if ::File.exist?("#{backup_unc_location}/#{backup_file}")
                       backup_unc_location
@@ -77,7 +82,7 @@ module SqlCmd
                       "\\\\#{server_settings['ServerName']}\\#{SqlCmd.config['sql_cmd']['backups']['default_backup_share']}"
                     end
     return [nil, nil] unless defined?(backup_folder)
-    [backup_folder, backup_name]
+    [backup_folder, backup_basename]
   end
 
   # sql_server_settings can be for any server that has network access to these files

data/lib/sql_cmd/database.rb

@@ -313,10 +313,10 @@ module SqlCmd
       SqlCmd.run_sql_as_job(connection_string, sql_backup_script, "Backup: #{backup_basename}", values: values, retries: 1, retry_delay: 30)
     end
 
-    def monitor_backup(backup_start_time, connection_string, database_name, options = {}, backup_folder: nil, backup_url: nil, backup_basename: nil, log_only: false, retries: 3, retry_delay: 10)
+    def monitor_backup(backup_start_time, connection_string, database_name, options = {}, job_name: nil, backup_folder: nil, backup_url: nil, backup_basename: nil, log_only: false, retries: 3, retry_delay: 10)
       backup_start_time = SqlCmd.unify_start_time(backup_start_time)
       backup_status_script = ::File.read("#{SqlCmd.sql_script_dir}/Status/BackupProgress.sql")
-      job_name = "Backup: #{database_name}"
+      job_name ||= "Backup: #{database_name}"
       EasyIO.logger.info 'Checking backup status...'
       EasyIO.logger.debug "Backup start time: #{backup_start_time}"
       sleep(3) # Give the job time to start
@@ -340,9 +340,9 @@ module SqlCmd
             # job_message = job_history_message(connection_string, job_name) unless result == :current
             if job_started # Check if job has timed out after stopping without completing
               job_completion_time ||= Time.now
-              _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, backup_basename, job_status: job_status, job_started: job_started) if Time.now > job_completion_time + timeout
+              _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, job_name, job_status: job_status, job_started: job_started) if Time.now > job_completion_time + timeout
             elsif Time.now > monitoring_start_time + timeout # Job never started and timed out
-              _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, backup_basename, job_status: job_status, job_started: job_started)
+              _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, job_name, job_status: job_status, job_started: job_started)
             end
             sleep(timer_interval)
             next
@@ -380,18 +380,18 @@ module SqlCmd
       result
     end
 
-    def _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, backup_basename, job_status: nil, job_started: false)
+    def _raise_backup_failure(connection_string, database_name, last_backup_date_key, backup_start_time, job_name, job_status: nil, job_started: false)
       server_name = SqlCmd.connection_string_part(connection_string, :server)
-      if job_started
-        failure_message = "Backup may have failed as the backup has stopped and the last backup time shows #{SqlCmd::Database.info(connection_string, database_name)[last_backup_date_key]} " \
-                          "but the backup should be newer than #{backup_start_time}! "
-        failure_message += job_status == 'NoJob' ? 'The job exited with success and so does not exist!' : "Check sql job 'Backup: #{backup_basename}' history on [#{server_name}] for details. \n"
-        raise failure_message + "Last backup time retrieved from: #{server_name}\\#{database_name}"
-      end
-      failure_message = "Backup appears to have failed! The last backup time shows #{SqlCmd::Database.info(connection_string, database_name)[last_backup_date_key]} " \
-                        "but the backup should be newer than #{backup_start_time}! "
-      failure_message += job_status == 'NoJob' ? 'The backup job could not be found!' : "The job did not start in time. Check sql job 'Backup: #{backup_basename}' history on [#{server_name}] for details."
-      raise failure_message + "Last backup time retrieved from: #{server_name}\\#{database_name}"
+      failure_message = if job_started
+                          "Backup may have failed as the backup has stopped and the last backup time shows #{SqlCmd::Database.info(connection_string, database_name)[last_backup_date_key]} " \
+                            "but the backup should be newer than #{backup_start_time}! " +
+                          (job_status == 'NoJob' ? 'The job exited with success and so does not exist!' : "Check sql job '#{job_name}' history on [#{server_name}] for details. \n")
+                        else
+                          "Backup appears to have failed! The last backup time shows #{SqlCmd::Database.info(connection_string, database_name)[last_backup_date_key]} " \
+                            "but the backup should be newer than #{backup_start_time}! " +
+                          (job_status == 'NoJob' ? 'The backup job could not be found!' : "The job did not start in time. Check sql job '#{job_name}' history on [#{server_name}] for details.")
+                        end
+      raise failure_message + " Last backup time retrieved from: #{server_name}\\#{database_name}"
     end
 
     # Creates and starts a SQL job to restore a database.
@@ -477,7 +477,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)
@@ -500,8 +500,8 @@ module SqlCmd
       database_info = info(connection_string, database_name) if database_info.nil?
       server_name = SqlCmd.connection_string_part(connection_string, :server)
       EasyIO.logger.info "Ensuring full backup has taken place for [#{server_name}].[#{database_name}]..."
-      if force_backup || database_info['LastNonCopyOnlyFullBackupDate'].nil? || # Ensure last full backup occurred AFTER the DB was last restored
-         (!database_info['LastRestoreDate'].nil? && database_info['LastNonCopyOnlyFullBackupDate'] < database_info['LastRestoreDate'])
+      start_time = database_info['LastRestoreDate'] || database_info['create_date']
+      if force_backup || database_info['LastNonCopyOnlyFullBackupDate'].nil? || (database_info['LastNonCopyOnlyFullBackupDate'] < start_time) # Ensure last full backup occurred AFTER the DB was last restored/created
         EasyIO.logger.info 'Running full backup...'
         backup_basename = "full_backup-#{database_name}_#{EasyTime.yyyymmdd}" # If a full_backup_method was not provided, use this name for the database backup for clarity
         full_backup_method.nil? ? SqlCmd::Database.backup(Time.now, connection_string, database_name, backup_basename: backup_basename, options: { 'copyonly' => false }) : full_backup_method.call
@@ -511,7 +511,7 @@ module SqlCmd
     def duplicate(start_time, source_connection_string, source_database_name, destination_connection_string, destination_database_name, backup_folder: nil, backup_url: nil, backup_basename: nil, force_restore: false, full_backup_method: nil, options: {})
       start_time = SqlCmd.unify_start_time(start_time)
       backup(start_time, source_connection_string, source_database_name, backup_folder: backup_folder, backup_url: backup_url, backup_basename: backup_basename, options: options) unless info(source_connection_string, source_database_name)['DatabaseNotFound']
-      backup_folder, backup_basename = SqlCmd.backup_location_and_basename(start_time, source_connection_string, source_database_name, options, backup_url: backup_url) # TODO: rework for URL
+      backup_folder, backup_basename = SqlCmd.backup_location_and_basename(start_time, source_connection_string, source_database_name, options, backup_folder: backup_folder, backup_url: backup_url, backup_basename: backup_basename) # TODO: rework for URL
       if (backup_folder.nil? && backup_url.nil?) || backup_basename.nil?
         source_server = SqlCmd.connection_string_part(source_connection_string, :server)
         destination_server = SqlCmd.connection_string_part(destination_connection_string, :server)
@@ -535,7 +535,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 +551,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)

data/lib/sql_cmd/format.rb

@@ -85,7 +85,7 @@ module SqlCmd
   end
 
   # get the basename of the backup based on a full file_path such as the SQL value from [backupmediafamily].[physical_device_name]
-  def backup_basename(backup_path)
+  def backup_basename_from_path(backup_path)
     return nil if backup_path.nil? || backup_path.empty?
     ::File.basename(backup_path).gsub(/(\.part\d+)?\.(bak|trn)/i, '')
   end

data/lib/sql_cmd/query.rb

@@ -83,7 +83,18 @@ module SqlCmd
       raise
     end
   ensure
-    ::File.delete "#{@scripts_cache_windows}\\sql_helper_#{start_time}.ps1" if defined?(start_time) && ::File.exist?("#{@scripts_cache_windows}\\sql_helper_#{start_time}.ps1")
+    retry_count = 0
+    retries = 3
+    retry_delay = 3
+    begin
+      ::File.delete "#{@scripts_cache_windows}\\sql_helper_#{start_time}.ps1" if defined?(start_time) && ::File.exist?("#{@scripts_cache_windows}\\sql_helper_#{start_time}.ps1")
+    rescue # Try to delete the file 3 times
+      if (retry_count += 1) <= retries
+        sleep(retry_delay)
+        retry
+      end
+      raise
+    end
   end
 
   def convert_powershell_tables_to_hash(json_string, return_type = :all_tables, at_timezone: 'UTC', string_to_time_by: '%Y-%m-%d %H:%M:%S %z') # options: :all_tables, :first_table, :first_row
@@ -234,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_cmd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_json_config