kiba-plus 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0ab521f8e00c7b382e0837b43ac63d46fa04d4
-  data.tar.gz: 6a0116b43920b28f6cd4c5f69f108c3d1c554006
+  metadata.gz: 861e4d341112d878c3a33856142b514f86475884
+  data.tar.gz: '05090fd337635b262970ac007c1f9fb550295e1b'
 SHA512:
-  metadata.gz: 67cc2a0d8b6c00951bacdfde6b9452a8057a5f7c274aa5e055ae1c0c759becd9bae7b816f380b96bb5483a4683881bd8956242d28792c3d5c28fa1418a690afc
-  data.tar.gz: f417fe27d5b199ef50f76e1a1441d7a1a44e41af3bfd92542b6fb4fe3e27dd423b75aa72026de781492924993b0ae867a2b3ff574f3d7235f4995cd465558bc0
+  metadata.gz: 223ab43b5c791aef57c9d46ef09825f6bb3b01e02a19b792f338279adc4206f8b69d4a9e0a8f284dcb29fd29e64700abb10c69c63305dfb228f270cd76e264ab
+  data.tar.gz: 32cf285eb64b8200eba18753c0dcb0ec974af74b18ee90f6df52d431a5f2c4c632f305c1901f3b24abb76c59d146a50bf56673366ca1b01075fc8a3d830195f3

data/lib/kiba/plus/job.rb

@@ -12,7 +12,7 @@ module Kiba
       attr_reader :options, :client
       def initialize(options)
         @options = options
-        @options.assert_valid_keys(:connect_url, :job_id, :job_name, :start_at, :completed_at, :schema)
+        @options.assert_valid_keys(:connect_url, :job_id, :job_name, :start_at, :completed_at, :schema, :job_table_name)
         url = URI.parse(connect_url)
         if url.scheme =~ /mysql/i
           @client = Mysql2::Client.new(mysql2_connect_hash(connect_url))
@@ -36,6 +36,10 @@ module Kiba
         options.fetch(:job_name)
       end
 
+      def job_table_name
+        options.fetch(:job_table_name, "etl_jobs")
+      end
+
       def start_at
         options.fetch(:start_at, Time.now)
       end
@@ -51,7 +55,7 @@ module Kiba
       end
 
       def last_pull_at
-        sql = "SELECT MAX(created_at) AS last_pull_at FROM jobs WHERE status = 'completed' AND job_name = '#{job_name}'"
+        sql = "SELECT MAX(created_at) AS last_pull_at FROM #{job_table_name} WHERE status = 'completed' AND job_name = '#{job_name}'"
         Kiba::Plus.logger.info sql
         client.query(sql).first["last_pull_at"]
       end
@@ -83,7 +87,7 @@ module Kiba
 
       def create_job_mysql
         sql = <<-SQL
-          INSERT INTO jobs (
+          INSERT INTO #{job_table_name} (
             completed_at,
             job_name,
             created_at,
@@ -99,7 +103,7 @@ module Kiba
 
       def create_job_pg
         sql = <<-SQL
-          INSERT INTO jobs (
+          INSERT INTO #{job_table_name} (
             completed_at,
             job_name,
             created_at,
@@ -112,7 +116,7 @@ module Kiba
 
       def create_table_pg
         sql = <<-SQL
-        CREATE TABLE IF NOT EXISTS jobs (
+        CREATE TABLE IF NOT EXISTS #{job_table_name} (
           id SERIAL,
           job_name varchar(255) NOT NULL,
           created_at TIMESTAMP without time zone,
@@ -127,7 +131,7 @@ module Kiba
 
       def create_table_mysql
         sql = <<-SQL
-        CREATE TABLE IF NOT EXISTS jobs (
+        CREATE TABLE IF NOT EXISTS #{job_table_name} (
           id integer(11) NOT NULL AUTO_INCREMENT,
           job_name varchar(255) NOT NULL,
           created_at datetime NOT NULL,
@@ -141,7 +145,7 @@ module Kiba
       end
 
       def complete_job
-        sql = "UPDATE jobs SET status = 'completed', completed_at = '#{completed_at.to_s}' WHERE id = #{job_id} AND job_name = '#{job_name}'"
+        sql = "UPDATE #{job_table_name} SET status = 'completed', completed_at = '#{completed_at.to_s}' WHERE id = #{job_id} AND job_name = '#{job_name}'"
         Kiba::Plus.logger.info sql
         @client.query(sql)
       end

data/lib/kiba/plus/version.rb

@@ -1,5 +1,5 @@
 module Kiba
   module Plus
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kiba-plus
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kiba