mysql_framework 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58087950c7f077b63745aea37c1b706a76a8288ac60a5f3e02bf3bc937dde99
-  data.tar.gz: 49949a1605bc8bfafe114e0a4a5448f84be21cce1939e7ddd708828d389993ca
+  metadata.gz: 089e9d32caf37e266ed17f4c366511814de266b3feaeed97c24781e4f7989de0
+  data.tar.gz: b566cdb40dc0466cc4b2878cc0e994fc252131350e79467e83e32b608717293e
 SHA512:
-  metadata.gz: 6a591cbb848fbcae354dd9c3a2c55c0ba1b44435701810018355ed9ca521efc2eb7a05613f92be2c9d175ea094a9b02fb1286e48ecd452d5e5985aad28ae1431
-  data.tar.gz: 6e64a6146a7949577a377019d4d7dd8b5439b023fb5a91780f367d371377ace7a632c91343fe490698887d8277586cf2dbdd7aac385cbb0c52c00223293a27c6
+  metadata.gz: 39624dce18fedfc9cc8664c9428bd431fd4f7a773239b7cac6e22cba403c2d839809b55ac82dc12c7f81685f3dbd060f00eda2542db3b871499278a2188f328c
+  data.tar.gz: 21f989dec1fd8399d119e50f038b18679361f924919151d36258468670955712d376c7bb0d928af12a1d60eab7cecae62af9111879dd191a371c7aa1b7420c0a

data/lib/mysql_framework/scripts/manager.rb

@@ -13,10 +13,10 @@ module MysqlFramework
 
           initialize_script_history
 
-          last_executed_script = retrieve_last_executed_script
+          executed_scripts = retrieve_executed_scripts
 
           mysql_connector.transaction do |client|
-            pending_scripts = calculate_pending_scripts(last_executed_script)
+            pending_scripts = calculate_pending_scripts(executed_scripts)
             MysqlFramework.logger.info do
               "[#{self.class}] - #{pending_scripts.length} pending data store scripts found."
             end
@@ -35,7 +35,7 @@ module MysqlFramework
           initialize_script_history
 
           mysql_connector.transaction do |client|
-            pending_scripts = calculate_pending_scripts(0)
+            pending_scripts = calculate_pending_scripts
             MysqlFramework.logger.info do
               "[#{self.class}] - #{pending_scripts.length} pending data store scripts found."
             end
@@ -48,23 +48,14 @@ module MysqlFramework
         end
       end
 
-      def drop_all_tables
-        drop_script_history
-        all_tables.each { |table| drop_table(table) }
-      end
-
-      def retrieve_last_executed_script
+      def retrieve_executed_scripts
         MysqlFramework.logger.debug { "[#{self.class}] - Retrieving last executed script from history." }
 
-        result = mysql_connector.query(<<~SQL)
+        results = mysql_connector.query(<<~SQL)
           SELECT `identifier` FROM `#{migration_table_name}` ORDER BY `identifier` DESC
         SQL
 
-        if result.each.to_a.length.zero?
-          0
-        else
-          Integer(result.first[:identifier])
-        end
+        results.to_a.map { |result| result[:identifier]&.to_i }
       end
 
       def initialize_script_history
@@ -80,19 +71,25 @@ module MysqlFramework
         SQL
       end
 
-      def calculate_pending_scripts(last_executed_script)
+      def calculate_pending_scripts(executed_scripts = [])
         MysqlFramework.logger.debug { "[#{self.class}] - Calculating pending data store scripts." }
 
-        migrations.map(&:new).select { |script| script.identifier > last_executed_script }.sort_by(&:identifier)
+        migrations.map(&:new).reject { |script| executed_scripts.include?(script.identifier) }.sort_by(&:identifier)
       end
 
       def table_exists?(table_name)
         result = mysql_connector.query(<<~SQL)
           SHOW TABLES LIKE '#{table_name}'
         SQL
+
         result.count == 1
       end
 
+      def drop_all_tables
+        drop_script_history
+        all_tables.each { |table| drop_table(table) }
+      end
+
       def drop_script_history
         drop_table(migration_table_name)
       end

data/lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/lib/mysql_framework/scripts/manager_spec.rb

@@ -45,22 +45,13 @@ describe MysqlFramework::Scripts::Manager do
     end
   end
 
-  describe '#drop_all_tables' do
-    it 'drops the script history table and any registered tables' do
-      expect(subject).to receive(:drop_script_history)
-      expect(subject).to receive(:drop_table).with('test')
-      expect(subject).to receive(:drop_table).with('demo')
-
-      subject.drop_all_tables
-    end
-  end
-
-  describe '#retrieve_last_executed_script' do
+  describe '#retrieve_executed_scripts' do
     before(:each) { subject.initialize_script_history }
 
     context 'when no scripts have been executed' do
-      it 'returns 0' do
-        expect(subject.retrieve_last_executed_script).to eq(0)
+      it 'returns an empty array' do
+        expect(subject.retrieve_executed_scripts).to be_a(Array)
+        expect(subject.retrieve_executed_scripts).to be_empty
       end
     end
 
@@ -69,7 +60,7 @@ describe MysqlFramework::Scripts::Manager do
       after(:each) { subject.drop_script_history }
 
       it 'returns the last executed script' do
-        expect(subject.retrieve_last_executed_script).to eq(201807031200)
+        expect(subject.retrieve_executed_scripts).to eq([201807031200, 201801011030])
       end
     end
   end
@@ -83,22 +74,27 @@ describe MysqlFramework::Scripts::Manager do
   end
 
   describe '#calculate_pending_scripts' do
-    it 'returns any scripts that are newer than the given date in ascending order' do
-      timestamp = 201701010000 # 00:00 01/01/2017
-      results = subject.calculate_pending_scripts(timestamp)
+    before(:each) { subject.drop_script_history }
+
+    context 'no migrations have been run' do
+      it 'returns all scripts that are missing in ascending order' do
+        results = subject.calculate_pending_scripts([])
 
-      expect(results.length).to eq(3)
-      expect(results[0]).to be_a(MysqlFramework::Support::Scripts::CreateTestTable)
-      expect(results[1]).to be_a(MysqlFramework::Support::Scripts::CreateDemoTable)
+        expect(results.length).to eq(3)
+        expect(results[0]).to be_a(MysqlFramework::Support::Scripts::CreateTestTable)
+        expect(results[1]).to be_a(MysqlFramework::Support::Scripts::CreateDemoTable)
+        expect(results[2]).to be_a(MysqlFramework::Support::Scripts::CreateTestProc)
+      end
     end
 
-    context 'when there are scripts older than the given date' do
-      it 'returns only scripts that are newer than the given date in ascending order' do
-        timestamp = 201802021010 # 10:10 02/02/2018
-        results = subject.calculate_pending_scripts(timestamp)
+    context 'some migrations have been run' do
+      it 'returns any scripts that are missing in ascending order' do
+        timestamp = 201806021520
+        results = subject.calculate_pending_scripts([timestamp])
 
         expect(results.length).to eq(2)
-        expect(results[0]).to be_a(MysqlFramework::Support::Scripts::CreateDemoTable)
+        expect(results[0]).to be_a(MysqlFramework::Support::Scripts::CreateTestTable)
+        expect(results[1]).to be_a(MysqlFramework::Support::Scripts::CreateTestProc)
       end
     end
   end
@@ -117,6 +113,16 @@ describe MysqlFramework::Scripts::Manager do
     end
   end
 
+  describe '#drop_all_tables' do
+    it 'drops the script history table and any registered tables' do
+      expect(subject).to receive(:drop_script_history)
+      expect(subject).to receive(:drop_table).with('test')
+      expect(subject).to receive(:drop_table).with('demo')
+
+      subject.drop_all_tables
+    end
+  end
+
   describe '#drop_script_history' do
     it 'drops the migration script history table' do
       query = <<~SQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler