mysql_framework 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74ebb1d0b4fb35020acec587f1eeacffa3304b5c1dc5fc79d3029c67a729e49
-  data.tar.gz: 2d0bc5074297085431f4def95bd8273c200eef9ecf3b4ddf26d7b936640b2978
+  metadata.gz: efd0a31b4662bc56a6c491b52d176f7400d26b848c7580593dd3aec47406754e
+  data.tar.gz: 3f76b0e9586b56d5c0293590decdbd2240831ff03f5015c159b440d10b25b59b
 SHA512:
-  metadata.gz: b954371d4415354b0c48624109c38107d8d132f3ecf104a94afa8503f04bedae5f89e034d87dd2d8632a31a7208f6a8a551ee59fb7fecc5035b17d09c39de21d
-  data.tar.gz: dca66fff5384d6e9fb324fc271fdc9c546d0f2bf68a7347314f1a22e68cda22505c4cd4758b2775bd2aaf1c6b054daebb74929ba9b71b05b3c0a6651d76e0c52
+  metadata.gz: b84eb01ebca2b310102b0dc84b4242d464349ac55c9f4f3b9133a6c06a16b73900c71de2b663e77c28553b9ad38b897036fc72344b2bbb969ab71e983dbd0595
+  data.tar.gz: 9be88e92dd00c7b12c6e936b93767badef60c3582599c2c093751f40dd5ba5f02c2e94170bb2cd17c8f8f799be8ebef68ffa23526df818c7b81778ad7d4fc051

data/lib/mysql_framework.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mysql2'
 require 'redlock'
 
@@ -11,5 +13,4 @@ require_relative 'mysql_framework/sql_table'
 require_relative 'mysql_framework/version'
 
 module MysqlFramework
-
 end

data/lib/mysql_framework/connector.rb

@@ -3,19 +3,50 @@
 module MysqlFramework
   class Connector
     def initialize(options = {})
-      @connection_pool = ::Queue.new
-
       @options = default_options.merge(options)
 
       Mysql2::Client.default_query_options.merge!(symbolize_keys: true, cast_booleans: true)
     end
 
-    # This method is called to fetch a client from the connection pool or create a new client if no idle clients
-    # are available.
+    # This method is called to setup a pool of MySQL connections.
+    def setup
+      @connection_pool = ::Queue.new
+
+      start_pool_size.times { @connection_pool.push(Mysql2::Client.new(@options)) }
+
+      @created_connections = start_pool_size
+    end
+
+    # This method is called to close all MySQL connections in the pool and dispose of the pool itself.
+    def dispose
+      return if @connection_pool.nil?
+
+      until @connection_pool.empty?
+        conn = @connection_pool.pop(true)
+        conn.close
+      end
+
+      @connection_pool = nil
+    end
+
+    # This method is called to get the idle connection queue for this connector.
+    def connections
+      @connection_pool
+    end
+
+    # This method is called to fetch a client from the connection pool.
     def check_out
       @connection_pool.pop(true)
-    rescue StandardError
-      Mysql2::Client.new(@options)
+    rescue ThreadError
+      if @created_connections < max_pool_size
+        conn = Mysql2::Client.new(@options)
+        @created_connections += 1
+        return conn
+      end
+
+      MysqlFramework.logger.error { "[#{self.class}] - Database connection pool depleted." }
+
+      raise 'Database connection pool depleted.'
     end
 
     # This method is called to check a client back in to the connection when no longer needed.
@@ -70,6 +101,8 @@ module MysqlFramework
       end
     end
 
+    private
+
     def default_options
       {
         host: ENV.fetch('MYSQL_HOST'),
@@ -80,5 +113,13 @@ module MysqlFramework
         reconnect: true
       }
     end
+
+    def start_pool_size
+      @start_pool_size ||= Integer(ENV.fetch('MYSQL_START_POOL_SIZE', 1))
+    end
+
+    def max_pool_size
+      @max_pool_size ||= Integer(ENV.fetch('MYSQL_MAX_POOL_SIZE', 5))
+    end
   end
 end

data/lib/mysql_framework/logger.rb

@@ -4,12 +4,12 @@ require 'logger'
 
 module MysqlFramework
   def self.logger
-    return @@logger
+    @@logger
   end
 
-  def self.set_logger(logger)
+  def self.logger=(logger)
     @@logger = logger
   end
 
-  MysqlFramework.set_logger(Logger.new(STDOUT))
+  MysqlFramework.logger = Logger.new(STDOUT)
 end

data/lib/mysql_framework/scripts/base.rb

@@ -3,31 +3,19 @@
 module MysqlFramework
   module Scripts
     class Base
-      def partitions
-        ENV.fetch('MYSQL_PARTITIONS', '500').to_i
-      end
-
-      def database_name
-        @database_name ||= ENV.fetch('MYSQL_DATABASE')
-      end
-
       def identifier
         raise NotImplementedError if @identifier.nil?
         @identifier
       end
 
-      def apply
+      def apply(_client)
         raise NotImplementedError
       end
 
-      def rollback
+      def rollback(_client)
         raise NotImplementedError
       end
 
-      def generate_partition_sql
-        (1..partitions).each_with_index.map { |_, i| "PARTITION p#{i} VALUES IN (#{i})" }.join(",\n\t")
-      end
-
       def self.descendants
         ObjectSpace.each_object(Class).select { |klass| klass < self }
       end
@@ -36,22 +24,26 @@ module MysqlFramework
         []
       end
 
-      def update_procedure(proc_name, proc_file)
-        mysql_connector.transaction do
-          mysql_connector.query(<<~SQL)
-            DROP PROCEDURE IF EXISTS #{proc_name};
-          SQL
+      def update_procedure(client, proc_name, proc_file)
+        client.query(<<~SQL)
+          DROP PROCEDURE IF EXISTS #{proc_name};
+        SQL
 
-          proc_sql = File.read(proc_file)
+        proc_sql = File.read(proc_file)
 
-          mysql_connector.query(proc_sql)
-        end
+        client.query(proc_sql)
+      end
+
+      protected
+
+      def generate_partition_sql
+        (1..partitions).each_with_index.map { |_, i| "PARTITION p#{i} VALUES IN (#{i})" }.join(",\n\t")
       end
 
       private
 
-      def mysql_connector
-        @mysql_connector ||= MysqlFramework::Connector.new
+      def partitions
+        @partitions ||= Integer(ENV.fetch('MYSQL_PARTITIONS', '500'))
       end
     end
   end

data/lib/mysql_framework/scripts/manager.rb

@@ -3,40 +3,48 @@
 module MysqlFramework
   module Scripts
     class Manager
+      def initialize(mysql_connector)
+        @mysql_connector = mysql_connector
+      end
+
       def execute
-        lock_manager.lock(self.class, 2000) do |locked|
+        lock_manager.lock(self.class, migration_ttl) do |locked|
           raise unless locked
 
           initialize_script_history
 
           last_executed_script = retrieve_last_executed_script
 
-          mysql_connector.transaction do
+          mysql_connector.transaction do |client|
             pending_scripts = calculate_pending_scripts(last_executed_script)
-            MysqlFramework.logger.info { "[#{self.class}] - #{pending_scripts.length} pending data store scripts found." }
+            MysqlFramework.logger.info do
+              "[#{self.class}] - #{pending_scripts.length} pending data store scripts found."
+            end
 
-            pending_scripts.each { |script| apply(script) }
+            pending_scripts.each { |script| apply(script, client) }
           end
 
-          MysqlFramework.logger.info { "[#{self.class}] - Migration script execution complete." }
+          MysqlFramework.logger.debug { "[#{self.class}] - Migration script execution complete." }
         end
       end
 
       def apply_by_tag(tags)
-        lock_manager.lock(self.class, 2000) do |locked|
+        lock_manager.lock(self.class, migration_ttl) do |locked|
           raise unless locked
 
           initialize_script_history
 
-          mysql_connector.transaction do
+          mysql_connector.transaction do |client|
             pending_scripts = calculate_pending_scripts(0)
-            MysqlFramework.logger.info { "[#{self.class}] - #{pending_scripts.length} pending data store scripts found." }
+            MysqlFramework.logger.info do
+              "[#{self.class}] - #{pending_scripts.length} pending data store scripts found."
+            end
 
             pending_scripts.reject { |script| (script.tags & tags).empty? }.sort_by(&:identifier)
-              .each { |script| apply(script) }
+              .each { |script| apply(script, client) }
           end
 
-          MysqlFramework.logger.info { "[#{self.class}] - Migration script execution complete." }
+          MysqlFramework.logger.debug { "[#{self.class}] - Migration script execution complete." }
         end
       end
 
@@ -46,10 +54,10 @@ module MysqlFramework
       end
 
       def retrieve_last_executed_script
-        MysqlFramework.logger.info { "[#{self.class}] - Retrieving last executed script from history." }
+        MysqlFramework.logger.debug { "[#{self.class}] - Retrieving last executed script from history." }
 
         result = mysql_connector.query(<<~SQL)
-          SELECT `identifier` FROM #{migration_table_name} ORDER BY `identifier` DESC
+          SELECT `identifier` FROM `#{migration_table_name}` ORDER BY `identifier` DESC
         SQL
 
         if result.each.to_a.length.zero?
@@ -60,10 +68,10 @@ module MysqlFramework
       end
 
       def initialize_script_history
-        MysqlFramework.logger.info { "[#{self.class}] - Initializing script history." }
+        MysqlFramework.logger.debug { "[#{self.class}] - Initializing script history." }
 
         mysql_connector.query(<<~SQL)
-          CREATE TABLE IF NOT EXISTS #{migration_table_name} (
+          CREATE TABLE IF NOT EXISTS `#{migration_table_name}` (
             `identifier` CHAR(15) NOT NULL,
             `timestamp` DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
             PRIMARY KEY (`identifier`),
@@ -73,10 +81,9 @@ module MysqlFramework
       end
 
       def calculate_pending_scripts(last_executed_script)
-        MysqlFramework.logger.info { "[#{self.class}] - Calculating pending data store scripts." }
+        MysqlFramework.logger.debug { "[#{self.class}] - Calculating pending data store scripts." }
 
-        MysqlFramework::Scripts::Base.descendants.map(&:new)
-          .select { |script| script.identifier > last_executed_script }.sort_by(&:identifier)
+        migrations.map(&:new).select { |script| script.identifier > last_executed_script }.sort_by(&:identifier)
       end
 
       def table_exists?(table_name)
@@ -92,7 +99,7 @@ module MysqlFramework
 
       def drop_table(table_name)
         mysql_connector.query(<<~SQL)
-          DROP TABLE IF EXISTS #{table_name}
+          DROP TABLE IF EXISTS `#{table_name}`
         SQL
       end
 
@@ -106,30 +113,30 @@ module MysqlFramework
 
       private
 
-      def mysql_connector
-        @mysql_connector ||= MysqlFramework::Connector.new
-      end
+      attr_reader :mysql_connector
 
       def lock_manager
         @lock_manager ||= Redlock::Client.new([ENV.fetch('REDIS_URL')])
       end
 
-      def database
-        @database ||= ENV.fetch('MYSQL_DATABASE')
+      def migration_ttl
+        @migration_ttl ||= ENV.fetch('MYSQL_MIGRATION_LOCK_TTL', 2000)
       end
 
       def migration_table_name
-        return @migration_table_name if @migration_table_name
+        @migration_table_name ||= ENV.fetch('MYSQL_MIGRATION_TABLE', 'migration_script_history')
+      end
 
-        @migration_table_name = "`#{database}`.`migration_script_history`"
+      def migrations
+        @migrations ||= MysqlFramework::Scripts::Base.descendants
       end
 
-      def apply(script)
+      def apply(script, client)
         MysqlFramework.logger.info { "[#{self.class}] - Applying script: #{script}." }
 
-        script.apply
-        mysql_connector.query(<<~SQL)
-          INSERT INTO #{migration_table_name} (`identifier`, `timestamp`) VALUES ('#{script.identifier}', NOW())
+        script.apply(client)
+        client.query(<<~SQL)
+          INSERT INTO `#{migration_table_name}` (`identifier`, `timestamp`) VALUES ('#{script.identifier}', NOW())
         SQL
       end
     end

data/lib/mysql_framework/version.rb

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

data/spec/lib/mysql_framework/connector_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::Connector do
+  let(:start_pool_size) { Integer(ENV.fetch('MYSQL_START_POOL_SIZE')) }
+  let(:max_pool_size) { Integer(ENV.fetch('MYSQL_MAX_POOL_SIZE')) }
   let(:default_options) do
     {
       host: ENV.fetch('MYSQL_HOST'),
@@ -15,26 +15,28 @@ describe MysqlFramework::Connector do
   end
   let(:options) do
     {
-      host: 'host',
-      port: 'port',
-      database: 'database',
-      username: 'username',
-      password: 'password',
-      reconnect: true
+      host: ENV.fetch('MYSQL_HOST'),
+      port: ENV.fetch('MYSQL_PORT'),
+      database: "#{ENV.fetch('MYSQL_DATABASE')}_2",
+      username: ENV.fetch('MYSQL_USERNAME'),
+      password: ENV.fetch('MYSQL_PASSWORD'),
+      reconnect: false
     }
   end
-  let(:client) { double }
+  let(:client) { double(close: true) }
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
   let(:existing_client) { Mysql2::Client.new(default_options) }
 
   subject { described_class.new }
 
-  describe '#initialize' do
-    it 'sets default query options on the Mysql2 client' do
-      subject
+  before(:each) { subject.setup }
+  after(:each) { subject.dispose }
 
-      expect(Mysql2::Client.default_query_options[:symbolize_keys]).to eq(true)
-      expect(Mysql2::Client.default_query_options[:cast_booleans]).to eq(true)
+  describe '#initialize' do
+    context 'when options are not provided' do
+      it 'returns the default options' do
+        expect(subject.instance_variable_get(:@options)).to eq(default_options)
+      end
     end
 
     context 'when options are provided' do
@@ -44,26 +46,82 @@ describe MysqlFramework::Connector do
         expect(subject.instance_variable_get(:@options)).to eq(options)
       end
     end
+
+    it 'sets default query options on the Mysql2 client' do
+      subject
+
+      expect(Mysql2::Client.default_query_options[:symbolize_keys]).to eq(true)
+      expect(Mysql2::Client.default_query_options[:cast_booleans]).to eq(true)
+    end
   end
 
-  describe '#check_out' do
-    it 'returns a Mysql2::Client instance from the pool' do
-      expect(Mysql2::Client).to receive(:new).with(default_options).and_return(client)
-      expect(subject.check_out).to eq(client)
+  describe '#setup' do
+    it 'creates a connection pool with the specified number of conections' do
+      subject.setup
+
+      expect(subject.connections.length).to eq(start_pool_size)
+    end
+  end
+
+  describe '#dispose' do
+    before do
+      subject.connections.clear
+      subject.connections.push(client)
     end
 
-    context 'when the connection pool has a client available' do
+    it 'closes the idle connections and disposes of the queue' do
+      expect(client).to receive(:close)
+
+      subject.dispose
+
+      expect(subject.connections).to be_nil
+    end
+  end
+
+  describe '#check_out' do
+    context 'when there are available connections' do
+      before do
+        subject.connections.clear
+        subject.connections.push(client)
+      end
+
       it 'returns a client instance from the pool' do
-        subject.instance_variable_get(:@connection_pool).push(client)
+        expect(subject.check_out).to eq(client)
+      end
+    end
+
+    context "when there are no available connections, and the pool's max size has not been reached" do
+      before do
+        subject.connections.clear
+        subject.connections.push(client)
+      end
+
+      it 'instantiates a new connection and returns it' do
+        subject.check_out
 
+        expect(Mysql2::Client).to receive(:new).with(default_options).and_return(client)
         expect(subject.check_out).to eq(client)
       end
     end
+
+    context "when there are no available connections, and the pool's max size has been reached" do
+      before do
+        subject.connections.clear
+        subject.instance_variable_set(:@created_connections, 5)
+
+        5.times { subject.check_in(client) }
+        5.times { subject.check_out }
+      end
+
+      it 'throws a RuntimeError' do
+        expect { subject.check_out }.to raise_error(RuntimeError)
+      end
+    end
   end
 
   describe '#check_in' do
     it 'returns the provided client to the connection pool' do
-      expect(subject.instance_variable_get(:@connection_pool)).to receive(:push).with(client)
+      expect(subject.connections).to receive(:push).with(client)
 
       subject.check_in(client)
     end
@@ -84,20 +142,8 @@ describe MysqlFramework::Connector do
   describe '#execute' do
     let(:insert_query) do
       MysqlFramework::SqlQuery.new.insert(gems)
-        .into(
-          gems[:id],
-          gems[:name],
-          gems[:author],
-          gems[:created_at],
-          gems[:updated_at]
-        )
-        .values(
-          SecureRandom.uuid,
-          'mysql_framework',
-          'sage',
-          Time.now,
-          Time.now
-        )
+        .into(gems[:id], gems[:name], gems[:author], gems[:created_at], gems[:updated_at])
+        .values(SecureRandom.uuid, 'mysql_framework', 'sage', Time.now, Time.now)
     end
 
     it 'executes the query with parameters' do
@@ -139,43 +185,14 @@ describe MysqlFramework::Connector do
   end
 
   describe '#query_multiple_results' do
-    let(:test) { MysqlFramework::SqlTable.new('test') }
-    let(:manager) { MysqlFramework::Scripts::Manager.new }
-    let(:connector) { MysqlFramework::Connector.new }
-    let(:timestamp) { Time.at(628_232_400) } # 1989-11-28 00:00:00 -0500
-    let(:guid) { 'a3ccb138-48ae-437a-be52-f673beb12b51' }
-    let(:insert) do
-      MysqlFramework::SqlQuery.new.insert(test)
-        .into(test[:id], test[:name], test[:action], test[:created_at], test[:updated_at])
-        .values(guid, 'name', 'action', timestamp, timestamp)
-    end
-    let(:obj) do
-      {
-        id: guid,
-        name: 'name',
-        action: 'action',
-        created_at: timestamp,
-        updated_at: timestamp
-      }
-    end
-
-    before :each do
-      manager.initialize_script_history
-      manager.execute
-
-      connector.execute(insert)
-    end
-
-    after(:each) { manager.drop_all_tables }
-
     it 'returns the results from the stored procedure' do
       query = 'call test_procedure'
       result = subject.query_multiple_results(query)
 
       expect(result).to be_a(Array)
       expect(result.length).to eq(2)
-      expect(result[0]).to eq([])
-      expect(result[1]).to eq([obj])
+      expect(result[0].length).to eq(0)
+      expect(result[1].length).to eq(4)
     end
 
     it 'does not check out a new client when one is provided' do
@@ -186,8 +203,8 @@ describe MysqlFramework::Connector do
 
       expect(result).to be_a(Array)
       expect(result.length).to eq(2)
-      expect(result[0]).to eq([])
-      expect(result[1]).to eq([obj])
+      expect(result[0].length).to eq(0)
+      expect(result[1].length).to eq(4)
     end
   end
 
@@ -208,18 +225,11 @@ describe MysqlFramework::Connector do
         expect(client).to receive(:query).with('ROLLBACK')
 
         begin
-          subject.transaction do
-            raise
-          end
-        rescue StandardError
+          subject.transaction { raise }
+        rescue StandardError => e
+          e.message
         end
       end
     end
   end
-
-  describe '#default_options' do
-    it 'returns the default options' do
-      expect(subject.default_options).to eq(default_options)
-    end
-  end
 end

data/spec/lib/mysql_framework/logger_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework do
   describe 'logger' do
     it 'returns the logger' do
@@ -9,11 +7,11 @@ describe MysqlFramework do
     end
   end
 
-  describe 'set_logger' do
+  describe 'logger=' do
     let(:logger) { Logger.new(STDOUT) }
 
     it 'sets the logger' do
-      subject.set_logger(logger)
+      subject.logger = logger
       expect(subject.logger).to eq(logger)
     end
   end

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

@@ -1,25 +1,13 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::Scripts::Base do
-  subject { described_class.new }
+  let(:client) { double }
 
-  describe '#partitions' do
-    it 'returns the number of paritions' do
-      expect(subject.partitions).to eq(5)
-    end
-  end
-
-  describe '#database_name' do
-    it 'returns the database name' do
-      expect(subject.database_name).to eq('test_database')
-    end
-  end
+  subject { described_class.new }
 
   describe '#identifier' do
     it 'throws a NotImplementedError' do
-      expect{ subject.identifier }.to raise_error(NotImplementedError)
+      expect { subject.identifier }.to raise_error(NotImplementedError)
     end
 
     context 'when @identifier is set' do
@@ -32,29 +20,24 @@ describe MysqlFramework::Scripts::Base do
 
   describe '#apply' do
     it 'throws a NotImplementedError' do
-      expect{ subject.apply }.to raise_error(NotImplementedError)
+      expect { subject.apply(client) }.to raise_error(NotImplementedError)
     end
   end
 
   describe '#rollback' do
     it 'throws a NotImplementedError' do
-      expect{ subject.rollback }.to raise_error(NotImplementedError)
-    end
-  end
-
-  describe '#generate_partition_sql' do
-    it 'generates the partition sql statement' do
-      expected = "PARTITION p0 VALUES IN (0),\n\tPARTITION p1 VALUES IN (1),\n\tPARTITION p2 VALUES IN (2),\n\tPARTITION p3 VALUES IN (3),\n\tPARTITION p4 VALUES IN (4)"
-      expect(subject.generate_partition_sql).to eq(expected)
+      expect { subject.rollback(client) }.to raise_error(NotImplementedError)
     end
   end
 
   describe '.descendants' do
     it 'returns all descendant classes' do
       expect(described_class.descendants.length).to eq(3)
-      expect(described_class.descendants).to include(MysqlFramework::Support::Scripts::CreateTestTable,
-                                                     MysqlFramework::Support::Scripts::CreateDemoTable,
-                                                     MysqlFramework::Support::Scripts::CreateTestProc)
+      expect(described_class.descendants).to include(
+        MysqlFramework::Support::Scripts::CreateTestTable,
+        MysqlFramework::Support::Scripts::CreateDemoTable,
+        MysqlFramework::Support::Scripts::CreateTestProc
+      )
     end
   end
 
@@ -65,7 +48,6 @@ describe MysqlFramework::Scripts::Base do
   end
 
   describe '#update_procedure' do
-    let(:connector) { MysqlFramework::Connector.new }
     let(:proc_file_path) { 'spec/support/procedure.sql' }
     let(:drop_sql) do
       <<~SQL
@@ -73,19 +55,11 @@ describe MysqlFramework::Scripts::Base do
       SQL
     end
 
-    before :each do
-      subject.instance_variable_set(:@mysql_connector, connector)
-    end
-
     it 'drops and then creates the named procedure' do
-      expect(connector).to receive(:query).with(drop_sql).once
-      expect(connector).to receive(:query).with(File.read(proc_file_path)).once
-      subject.update_procedure('test_procedure', proc_file_path)
-    end
+      expect(client).to receive(:query).with(drop_sql).once
+      expect(client).to receive(:query).with(File.read(proc_file_path)).once
 
-    it 'wraps the call in a transaction' do
-      expect(connector).to receive(:transaction)
-      subject.update_procedure('test_procedure', proc_file_path)
+      subject.update_procedure(client, 'test_procedure', proc_file_path)
     end
   end
 end

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

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::Scripts::Manager do
-  let(:connector) { MysqlFramework::Connector.new }
-
-  before :each do
-    subject.instance_variable_set(:@mysql_connector, connector)
+  let(:connector) do
+    connector = MysqlFramework::Connector.new
+    connector.setup
+    connector
   end
 
+  subject { described_class.new(connector) }
+
   describe '#execute' do
-    before :each do
+    before(:each) do
+      subject.drop_all_tables
       subject.initialize_script_history
     end
+    after(:each) { subject.drop_all_tables }
 
     it 'executes all pending scripts' do
       expect(subject.table_exists?('demo')).to eq(false)
@@ -23,16 +25,14 @@ describe MysqlFramework::Scripts::Manager do
       expect(subject.table_exists?('demo')).to eq(true)
       expect(subject.table_exists?('test')).to eq(true)
     end
-
-    after :each do
-      subject.drop_all_tables
-    end
   end
 
   describe '#apply_by_tag' do
-    before :each do
+    before(:each) do
+      subject.drop_all_tables
       subject.initialize_script_history
     end
+    after(:each) { subject.drop_all_tables }
 
     it 'executes all pending scripts that match the tag' do
       expect(subject.table_exists?('demo')).to eq(false)
@@ -43,10 +43,6 @@ describe MysqlFramework::Scripts::Manager do
       expect(subject.table_exists?('demo')).to eq(false)
       expect(subject.table_exists?('test')).to eq(true)
     end
-
-    after :each do
-      subject.drop_all_tables
-    end
   end
 
   describe '#drop_all_tables' do
@@ -60,9 +56,7 @@ describe MysqlFramework::Scripts::Manager do
   end
 
   describe '#retrieve_last_executed_script' do
-    before :each do
-      subject.initialize_script_history
-    end
+    before(:each) { subject.initialize_script_history }
 
     context 'when no scripts have been executed' do
       it 'returns 0' do
@@ -71,18 +65,13 @@ describe MysqlFramework::Scripts::Manager do
     end
 
     context 'when scripts have been executed previously' do
-      before :each do
-        subject.apply_by_tag([MysqlFramework::Support::Tables::TestTable::NAME])
-      end
+      before(:each) { subject.apply_by_tag([MysqlFramework::Support::Tables::TestTable::NAME]) }
+      after(:each) { subject.drop_script_history }
 
       it 'returns the last executed script' do
         expect(subject.retrieve_last_executed_script).to eq(201807031200)
       end
     end
-
-    after :each do
-      subject.drop_script_history
-    end
   end
 
   describe '#initialize_script_history' do
@@ -131,7 +120,7 @@ describe MysqlFramework::Scripts::Manager do
   describe '#drop_script_history' do
     it 'drops the migration script history table' do
       query = <<~SQL
-        DROP TABLE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`.`migration_script_history`
+        DROP TABLE IF EXISTS `#{ENV.fetch('MYSQL_MIGRATION_TABLE', 'migration_script_history')}`
       SQL
       expect(connector).to receive(:query).with(query)
       subject.drop_script_history
@@ -141,21 +130,21 @@ describe MysqlFramework::Scripts::Manager do
   describe '#drop_table' do
     it 'drops the given table' do
       expect(connector).to receive(:query).with(<<~SQL)
-        DROP TABLE IF EXISTS `some_database`.`some_table`
+        DROP TABLE IF EXISTS `some_table`
       SQL
-      subject.drop_table('`some_database`.`some_table`')
+      subject.drop_table('some_table')
     end
   end
 
   describe '#all_tables' do
     it 'returns all registered tables' do
-      expect(subject.all_tables).to eq(['test', 'demo'])
+      expect(subject.all_tables).to eq(%w(test demo))
     end
   end
 
   describe '.all_tables' do
     it 'stores a class level array of tables' do
-      expect(described_class.all_tables).to eq(['test', 'demo'])
+      expect(described_class.all_tables).to eq(%w(test demo))
     end
   end
 end

data/spec/lib/mysql_framework/sql_column_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::SqlColumn do
   subject { described_class.new(table: 'gems', column: 'version') }
 

data/spec/lib/mysql_framework/sql_condition_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::SqlCondition do
   subject { described_class.new(column: 'version', comparison: '=', value: '1.0.0') }
 

data/spec/lib/mysql_framework/sql_query_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::SqlQuery do
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
   let(:versions) { MysqlFramework::SqlTable.new('versions') }

data/spec/lib/mysql_framework/sql_table_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe MysqlFramework::SqlTable do
   let(:table) { described_class.new('gems') }
 

data/spec/spec_helper.rb

@@ -6,12 +6,18 @@ SimpleCov.start do
   add_filter 'spec/'
 end
 
-ENV['MYSQL_DATABASE'] ||= 'test_database'
-ENV['MYSQL_HOST'] ||= '127.0.0.1'
+ENV['RACK_ENV'] = 'test'
+
+ENV['MYSQL_START_POOL_SIZE'] ||= '1'
+ENV['MYSQL_MAX_POOL_SIZE'] ||= '5'
 ENV['MYSQL_PARTITIONS'] ||= '5'
-ENV['MYSQL_PASSWORD'] ||= ''
+
+ENV['MYSQL_HOST'] ||= '127.0.0.1'
 ENV['MYSQL_PORT'] ||= '3306'
+ENV['MYSQL_DATABASE'] ||= 'test_database'
 ENV['MYSQL_USERNAME'] ||= 'root'
+ENV['MYSQL_PASSWORD'] ||= ''
+
 ENV['REDIS_URL'] ||= 'redis://127.0.0.1:6379'
 
 require 'bundler'
@@ -23,10 +29,11 @@ require_relative 'support/scripts/create_demo_table'
 require_relative 'support/scripts/create_test_proc'
 require_relative 'support/tables/test'
 require_relative 'support/tables/demo'
+require_relative 'support/fixtures'
 
-RSpec.configure do |config|
-  config.before(:each) { MysqlFramework.logger.level = Logger::ERROR }
+MysqlFramework::Support::Fixtures.execute
 
+RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
@@ -35,25 +42,3 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 end
-
-client = Mysql2::Client.new(
-  host: ENV.fetch('MYSQL_HOST'),
-  port: ENV.fetch('MYSQL_PORT'),
-  username: ENV.fetch('MYSQL_USERNAME'),
-  password: ENV.fetch('MYSQL_PASSWORD')
-)
-client.query("DROP DATABASE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`;")
-client.query("CREATE DATABASE `#{ENV.fetch('MYSQL_DATABASE')}`;")
-
-connector = MysqlFramework::Connector.new
-connector.query("DROP TABLE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`.`gems`")
-connector.query(<<~SQL)
-  CREATE TABLE `#{ENV.fetch('MYSQL_DATABASE')}`.`gems` (
-    `id` CHAR(36) NOT NULL,
-    `name` VARCHAR(255) NULL,
-    `author` VARCHAR(255) NULL,
-    `created_at` DATETIME,
-    `updated_at` DATETIME,
-    PRIMARY KEY (`id`)
-  )
-SQL

data/spec/support/fixtures.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module MysqlFramework
+  module Support
+    class Fixtures
+      def self.execute
+        connector = MysqlFramework::Connector.new(
+          host: ENV.fetch('MYSQL_HOST'),
+          port: ENV.fetch('MYSQL_PORT'),
+          database: nil,
+          username: ENV.fetch('MYSQL_USERNAME'),
+          password: ENV.fetch('MYSQL_PASSWORD')
+        )
+        connector.setup
+
+        client = connector.check_out
+
+        client.query("DROP DATABASE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`;")
+        client.query("DROP DATABASE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}_2`;")
+        client.query("CREATE DATABASE `#{ENV.fetch('MYSQL_DATABASE')}`;")
+        client.query("CREATE DATABASE `#{ENV.fetch('MYSQL_DATABASE')}_2`;")
+        client.query("USE `#{ENV.fetch('MYSQL_DATABASE')}`;")
+        client.query(<<~SQL)
+          CREATE TABLE `gems` (
+            `id` CHAR(36) NOT NULL,
+            `name` VARCHAR(255) NULL,
+            `author` VARCHAR(255) NULL,
+            `created_at` DATETIME,
+            `updated_at` DATETIME,
+            PRIMARY KEY (`id`)
+          )
+        SQL
+        client.query(<<~SQL)
+          INSERT INTO `gems`
+          (`id`, `name`, `author`, `created_at`, `updated_at`)
+          VALUES
+          ('#{SecureRandom.uuid}', 'mysql_framework', 'Sage', NOW(), NOW()),
+          ('#{SecureRandom.uuid}', 'sinject', 'Sage', NOW(), NOW())
+        SQL
+
+        connector.check_in(client)
+
+        manager = MysqlFramework::Scripts::Manager.new(connector)
+        manager.execute
+
+        connector.dispose
+      end
+    end
+  end
+end

data/spec/support/procedure.sql

@@ -1,5 +1,5 @@
 CREATE PROCEDURE `test_procedure`()
 BEGIN
   SELECT * FROM demo;
-  SELECT * FROM test;
-END
+  SELECT * FROM gems;
+END

data/spec/support/scripts/create_demo_table.rb

@@ -8,25 +8,34 @@ module MysqlFramework
           @identifier = 201806021520 # 15:20 02/06/2018
         end
 
-        def apply
-          mysql_connector.query(<<~SQL)
-            CREATE TABLE IF NOT EXISTS `#{database_name}`.`demo` (
+        def apply(client)
+          client.query(<<~SQL)
+            CREATE TABLE IF NOT EXISTS `#{table_name}` (
               `id` CHAR(36) NOT NULL,
               `name` VARCHAR(255) NULL,
               `created_at` DATETIME NOT NULL,
-
               `updated_at` DATETIME NOT NULL,
-              PRIMARY KEY (`id`)
+              `partition` INT NOT NULL,
+              PRIMARY KEY (`id`, `partition`)
+            )
+            PARTITION BY LIST(`partition`) (
+              #{generate_partition_sql}
             )
           SQL
         end
 
-        def rollback
+        def rollback(_client)
           raise 'Rollback not supported in test.'
         end
 
         def tags
-          [MysqlFramework::Support::Tables::DemoTable::NAME]
+          [table_name]
+        end
+
+        private
+
+        def table_name
+          MysqlFramework::Support::Tables::DemoTable::NAME
         end
       end
     end

data/spec/support/scripts/create_test_proc.rb

@@ -10,16 +10,22 @@ module MysqlFramework
 
         PROC_FILE = 'spec/support/procedure.sql'
 
-        def apply
-          update_procedure('test_procedure', PROC_FILE)
+        def apply(client)
+          update_procedure(client, 'test_procedure', PROC_FILE)
         end
 
-        def rollback
+        def rollback(_client)
           raise 'Rollback not supported in test.'
         end
 
         def tags
-          [MysqlFramework::Support::Tables::TestTable::NAME, 'TestProc']
+          [table_name, 'TestProc']
+        end
+
+        private
+
+        def table_name
+          MysqlFramework::Support::Tables::TestTable::NAME
         end
       end
     end

data/spec/support/scripts/create_test_table.rb

@@ -8,9 +8,9 @@ module MysqlFramework
           @identifier = 201801011030 # 10:30 01/01/2018
         end
 
-        def apply
-          mysql_connector.query(<<~SQL)
-            CREATE TABLE IF NOT EXISTS `#{database_name}`.`test` (
+        def apply(client)
+          client.query(<<~SQL)
+            CREATE TABLE IF NOT EXISTS `#{table_name}` (
               `id` CHAR(36) NOT NULL,
               `name` VARCHAR(255) NULL,
               `action` VARCHAR(255) NULL,
@@ -21,12 +21,18 @@ module MysqlFramework
             SQL
         end
 
-        def rollback
+        def rollback(_client)
           raise 'Rollback not supported in test.'
         end
 
         def tags
-          [MysqlFramework::Support::Tables::TestTable::NAME]
+          [table_name]
+        end
+
+        private
+
+        def table_name
+          MysqlFramework::Support::Tables::TestTable::NAME
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - spec/lib/mysql_framework/sql_query_spec.rb
 - spec/lib/mysql_framework/sql_table_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixtures.rb
 - spec/support/procedure.sql
 - spec/support/scripts/create_demo_table.rb
 - spec/support/scripts/create_test_proc.rb