fix: creating ignore-table option

vrerv · Aug 17, 2024 · c8ebcce · c8ebcce
1 parent b9daf73
commit c8ebcce
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/lib/mysql_db_tool/backup.rb b/lib/mysql_db_tool/backup.rb
@@ -41,7 +41,7 @@ def perform
 
         puts "backupFile=#{backupFile}"
 
-        ignoreTablesOption = @ignore_tables.map { |e| "--ignore-table=#{@db_info[:database]}.#{e}"  }.join(' ')
+        ignoreTablesOption = @ignore_tables.map { |e| "--ignore-table=#{e.include?('.') ? e : "#{database}.#{e}"}" }.join(' ')
 
         commands.push gzipCommand("mysqldump --no-data #{ignoreTablesOption} #{defaultOptions}", isGzip, "#{backupFile}-schema.sql", gzipSuffix)
 
@@ -57,7 +57,7 @@ def perform
           end
         }
 
-        commands.push(gzipCommand("mysqldump --no-create-info #{options} #{defaultOptions} #{backupTables.join(' ')}", isGzip, "#{backupFile}-all-other-tables.sql", gzipSuffix))
+        commands.push(gzipCommand("mysqldump --no-create-info #{ignoreTablesOption} #{options} #{defaultOptions} #{backupTables.join(' ')}", isGzip, "#{backupFile}-all-other-tables.sql", gzipSuffix))
         commands
       end
     end

diff --git a/spec/mysql_db_tool/backup_spec.rb b/spec/mysql_db_tool/backup_spec.rb
@@ -12,6 +12,9 @@
       data_tables: [],
       ignore_tables: []
     })
+
+    fixed_time = DateTime.new(2024, 7, 17, 12, 0, 0)
+    allow(DateTime).to receive(:now).and_return(fixed_time)
   end
 
   describe '#perform' do
@@ -20,14 +23,12 @@
     let(:instance) { described_class.new(options) }
 
     it 'backs up each database' do
-      fixed_time = DateTime.new(2024, 7, 17, 12, 0, 0)
-      allow(DateTime).to receive(:now).and_return(fixed_time)
 
       commands = instance.perform
       expect(commands).to eq ([
         "mkdir -p backup-42/0_test_db-abc",
         "mysqldump --no-data  --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   > backup-42/0_test_db-abc/2024-07-17_42-schema.sql",
-        "mysqldump --no-create-info --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc    > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql"
+        "mysqldump --no-create-info  --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc    > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql"
       ])
     end
   end
@@ -38,14 +39,12 @@
     let(:instance) { described_class.new(options) }
 
     it 'backs up with gzip' do
-      fixed_time = DateTime.new(2024, 7, 17, 12, 0, 0)
-      allow(DateTime).to receive(:now).and_return(fixed_time)
 
       commands = instance.perform
       expect(commands).to eq ([
         "mkdir -p backup-42/0_test_db-abc",
         "mysqldump --no-data  --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc  | gzip  > backup-42/0_test_db-abc/2024-07-17_42-schema.sql.gz",
-        "mysqldump --no-create-info --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   | gzip  > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql.gz"
+        "mysqldump --no-create-info  --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   | gzip  > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql.gz"
       ])
     end
   end
@@ -56,14 +55,34 @@
     let(:instance) { described_class.new(options) }
 
     it 'backs up with gzip and set gzip suffix' do
-      fixed_time = DateTime.new(2024, 7, 17, 12, 0, 0)
-      allow(DateTime).to receive(:now).and_return(fixed_time)
 
       commands = instance.perform
       expect(commands).to eq ([
         "mkdir -p backup-42/0_test_db-abc",
         "mysqldump --no-data  --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc  | gzip  > backup-42/0_test_db-abc/2024-07-17_42-schema.sql.Z",
-        "mysqldump --no-create-info --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   | gzip  > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql.Z"
+        "mysqldump --no-create-info  --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   | gzip  > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql.Z"
+      ])
+    end
+  end
+
+  describe '#perform' do
+
+    let(:options) { { env: 'backup-test-env', id: '42', run: false, gzip: false } }
+    let(:instance) { described_class.new(options) }
+
+    it 'backs up with ignore table' do
+
+      allow(MySQLDBTool::Config::ConfigLoader).to receive(:load).and_return ({
+        db_info: { user: 'test-user', password: '', host: 'my-host', database: ['test_db-abc'] },
+        data_tables: [],
+        ignore_tables: ['ignore_table1', 'ignore_table2']
+      })
+
+      commands = instance.perform
+      expect(commands).to eq ([
+        "mkdir -p backup-42/0_test_db-abc",
+        "mysqldump --no-data --ignore-table=test_db-abc.ignore_table1 --ignore-table=test_db-abc.ignore_table2 --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc   > backup-42/0_test_db-abc/2024-07-17_42-schema.sql",
+        "mysqldump --no-create-info --ignore-table=test_db-abc.ignore_table1 --ignore-table=test_db-abc.ignore_table2 --single-transaction --skip-lock-tables --column-statistics=0  --ssl-mode=disabled -h my-host -u test-user   test_db-abc    > backup-42/0_test_db-abc/2024-07-17_42-all-other-tables.sql"
       ])
     end
   end