flydata 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b335ff2222169fc42a78d4dec2a5829aa0c94230
-  data.tar.gz: 15042a74de15a15b3784c6917973154d1ddd02c7
+  metadata.gz: 4c1e7d064581a7d76441fa77bc814c1ebba986cd
+  data.tar.gz: bb14ff1bbf83246092ddbc44332dadc42725e1f7
 SHA512:
-  metadata.gz: 86fb1aa9fe1449e11f0d8755773cd7a083054bb668df7dbf489973828b018f9ebe2e9a10850bcf8ca7afff7682f157cd7d3a3082907b458ad1b5cbba99cf73b5
-  data.tar.gz: d36c033143bdd9a1b5931d891406ec6dfbaeaeba70cdae08d78c3282ccf55bebbe3125921bec021bbbb9405907a52431ac0f220722fa10f771db421134c7f348
+  metadata.gz: b3fee3b20cdb7ef01f45a05d3485e637fcb794c15c4bb31e2027535241db6ee31de9c7b97e8b5a4ab1892b415a1a26a336c525d8a9a19b960c2d4b5e5677006e
+  data.tar.gz: 477339f6ca63c80d13a9d499e062c5e42cae23a99a24d058f37fdbea01829084c9f137e7c00baa88bc56ff5389fd858119fc2c4ce1583358505e9dd7bfac4d05

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/ext/flydata/source_mysql/parser/sql_parser.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include "sql_parser.h"
 
-static int $DEBUG = 0;
+#define DEBUG 0
 
 enum status_t {
   start,
@@ -54,7 +54,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case value:
-        if ($DEBUG) std::cout << "value[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "value[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == '\'') {
           status = first_char;
         } else if (*current == 'N') {
@@ -76,7 +76,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case first_zero:
-        if ($DEBUG) std::cout << "first_zero[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "first_zero[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == ',') {
           ch.value_callback(mark, value_len - 1, true);//value_callback :end_value
           mark = 0; value_len = 0; //mark_reset
@@ -102,7 +102,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case leading_zero:
-        if ($DEBUG) std::cout << "leading_zero[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "leading_zero[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == ',') {
           ch.value_callback(mark, value_len - 1, true);//value_callback :end_value
           mark = 0; value_len = 0; //mark_reset
@@ -126,7 +126,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case number:
-           if ($DEBUG) std::cout << "number[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+           if (DEBUG) std::cout << "number[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current >= '0' && *current <= '9') || *current == '.' || *current == 'e' || *current == 'E' || *current == '-') {
           status = number;
         } else if (*current == ',') {
@@ -144,7 +144,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case null_n:
-            if ($DEBUG) std::cout << "null_n[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+            if (DEBUG) std::cout << "null_n[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
      if (*current == 'U') {
           status = null_u;
         } else {
@@ -153,7 +153,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case null_u:
-             if ($DEBUG) std::cout << "null_u[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+             if (DEBUG) std::cout << "null_u[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
     if (*current == 'L') {
           status = null_l1;
         } else {
@@ -162,7 +162,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case null_l1:
-        if ($DEBUG) std::cout << "null_l1[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "null_l1[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == 'L') {
           status = null_l2;
         } else {
@@ -171,7 +171,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
        break;
 
       case null_l2:
-         if ($DEBUG) std::cout << "null_l2[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+         if (DEBUG) std::cout << "null_l2[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == ',') {
           //# 0 is NULL pointer
           ch.value_callback(0, 0, true);//value_callback 0 :end_value
@@ -189,7 +189,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
       
       case hex_blob:
-        if ($DEBUG) std::cout << "hex_blob[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "hex_blob[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current >= '0' && *current <= '9') ||
             (*current >= 'A' && *current <= 'F') ||
             (*current >= 'a' && *current <= 'f')) {
@@ -200,7 +200,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
        break;
 
       case hex_blob_number:
-        if ($DEBUG) std::cout << "hex_blob_number[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "hex_blob_number[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current >= '0' && *current <= '9') ||
             (*current >= 'A' && *current <= 'F') ||
             (*current >= 'a' && *current <= 'f')) {
@@ -220,7 +220,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case first_char:
-         if ($DEBUG) std::cout << "first_char[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+         if (DEBUG) std::cout << "first_char[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == '\'') {
            mark = current; value_len = 1; //mark
            ch.value_callback(mark, value_len - 1, true);//value_callback, :end_value
@@ -248,7 +248,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_2_firstbyte:
-        if ($DEBUG) std::cout << "utf8_2_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_2_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           temp_mark = 0; //temp_mark reset)
           status = following_char;
@@ -262,7 +262,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_3_firstbyte:
-        if ($DEBUG) std::cout << "utf8_3_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_3_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           status = utf8_3_secondbyte;
         } else {
@@ -271,7 +271,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_3_secondbyte:
-        if ($DEBUG) std::cout << "utf8_3_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_3_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           temp_mark = 0; //temp_mark reset)
           status = following_char;
@@ -285,7 +285,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_3_err_secondbyte:
-        if ($DEBUG) std::cout << "utf8_3_err_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_3_err_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         ch.value_callback(mark, temp_mark - mark, false);//value_callback mark...temp_mark
         mark = 0; value_len = 0; //mark_reset
         ch.value_callback("\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd", 9, false); //value_callback "\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd"
@@ -294,7 +294,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_4_firstbyte:
-        if ($DEBUG) std::cout << "utf8_4_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_4_firstbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           status = utf8_4_secondbyte;
         } else {
@@ -303,7 +303,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_4_secondbyte:
-        if ($DEBUG) std::cout << "utf8_4_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_4_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           status = utf8_4_thirdbyte;
         } else {
@@ -312,12 +312,12 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_4_err_secondbyte:
-        if ($DEBUG) std::cout << "utf8_4_err_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_4_err_secondbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         status = utf8_4_err_thirdbyte;
         break;
 
       case utf8_4_thirdbyte:
-        if ($DEBUG) std::cout << "utf8_4_thirdbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_4_thirdbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if ((*current & 0xc0) == 0x80) {
           temp_mark = 0; //temp_mark reset)
           status = following_char;
@@ -331,7 +331,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case utf8_4_err_thirdbyte:
-        if ($DEBUG) std::cout << "utf8_4_err_thirdbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "utf8_4_err_thirdbyte[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         ch.value_callback(mark, temp_mark - mark, false);//value_callback mark...temp_mark
         mark = 0; value_len = 0; //mark_reset
         ch.value_callback("\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd", 12, false); //value_callback "\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd\xef\xbf\xbd"
@@ -340,7 +340,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case following_char:
-         if ($DEBUG) std::cout << "following_char[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+         if (DEBUG) std::cout << "following_char[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == '\'') {
           ch.value_callback(mark, value_len - 1, true);//value_callback, :end_value
           mark = 0; value_len = 0; //mark_reset
@@ -364,7 +364,7 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case escape:
-        if ($DEBUG) std::cout << "escape[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "escape[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         if (*current == '\"') {
           ch.value_callback("\"", 1, false);//value_callback '\"'
           mark = 0; value_len = 0;
@@ -401,12 +401,12 @@ long parse_insert_query(const char* sql, long len, ParserCallbackHandler& ch)
         break;
 
       case error:
-       if ($DEBUG) std::cout << "error[" << *current << std::endl << std::flush;
+       if (DEBUG) std::cout << "error[" << *current << std::endl << std::flush;
        ret = pos - 1;
        break;
 
       default:
-        if ($DEBUG) std::cout << "default[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
+        if (DEBUG) std::cout << "default[" << *current << "(0x" << std::hex << (*current & 0xff) << ")]: " << std::endl << std::flush;
         break;
     }//switch
     if (ret != -1)

data/flydata-core/lib/flydata-core/postgresql/compatibility_checker.rb

@@ -1,6 +1,5 @@
 require 'flydata-core/errors'
-require 'flydata-core/postgresql/config'
-require 'pg'
+require 'flydata-core/postgresql/pg_client'
 
 module FlydataCore
   module Postgresql
@@ -37,19 +36,15 @@ module FlydataCore
 
       def exec_query(query)
         begin
-          client = PGconn.connect(FlydataCore::Postgresql::Config.opts_for_pg(@option))
-          client.exec(query)
+          client = PGClient.new(@option)
+          client.query(query)
         ensure
           client.close rescue nil if client
         end
       end
 
       def schema_and_table_in_query(option = @option)
-        schema = if option[:schema].to_s.strip.empty?
-                   "select current_schema"
-                 else
-                   "'#{option[:schema]}'"
-                 end
+        schema = FlydataCore::Postgresql::QueryHelper.schema_as_value(option[:schema])
         {
           schema_name: schema,
           table_names: option[:tables].collect{|tn| "'#{tn}'"}.join(',')

data/flydata-core/lib/flydata-core/postgresql/pg_client.rb

@@ -2,6 +2,7 @@ require 'pg'
 require 'socket'
 require 'delegate'
 require 'flydata-core/postgresql/config'
+require 'flydata-core/postgresql/query_helper'
 
 module FlydataCore
 module Postgresql

data/flydata-core/lib/flydata-core/postgresql/query_helper.rb

@@ -0,0 +1,17 @@
+module FlydataCore
+module Postgresql
+
+class QueryHelper
+  # Return query getting a current_schema if schema is nil or empty
+  def self.schema_as_value(schema)
+    s = schema.to_s.strip
+    if s.empty?
+      '(select current_schema)'
+    else
+      "'#{s}'"
+    end
+  end
+end
+
+end
+end

data/flydata-core/lib/flydata-core/postgresql/snapshot.rb

@@ -11,6 +11,8 @@ class Snapshot
 
   def initialize(txid_snapshot)
     @txid_snapshot_str = txid_snapshot.to_s
+
+    return if self.empty?
     xmin_str, xmax_str, xip_list_str = @txid_snapshot_str.split(':')
 
     raise ArgumentError, "Invalid snapshot - xmin is empty." if xmin_str.to_s.empty?
@@ -27,7 +29,16 @@ class Snapshot
     @txid_snapshot_str
   end
 
+  def empty?
+    @txid_snapshot_str == '-'
+  end
+
   def <=>(other)
+    return 0 if empty? && other.empty?
+    if self.empty? || other.empty?
+      raise ArgumentError.new("comparison with empty source pos failed")
+    end
+
     if @xmin == other.xmin
       if @xmax == other.xmax
         # items xip_list will disappear after the transaction is completed,

data/flydata-core/lib/flydata-core/postgresql/source_pos.rb

@@ -59,6 +59,10 @@ class SourcePos
   attr_reader :to_snapshot
   attr_reader :pk_values
 
+  def empty?
+    @snapshot.empty?
+  end
+
   def to_s
     pk_values = @pk_values ? @pk_values.to_json : ''
     "#{@snapshot}\t#{@to_snapshot}\t#{pk_values}"

data/flydata-core/lib/flydata-core/table_def/postgresql_table_def.rb

@@ -10,8 +10,8 @@ class PostgresqlTableDef < Base
   TYPE_MAP_P2F = {
     'bigint' => {type: 'int8'},
     'int8' => {type: 'int8'},
-    'bigserial' => {type: 'serial8'}, # TODO support
-    'serial8' => {type: 'serial8'}, # TODO support
+    'bigserial' => {type: 'serial8'},
+    'serial8' => {type: 'serial8'},
     'bit' => {type: 'bit',
               width_attrs:["character_maximum_length"]},
     'bit varying' => {type: 'varbit',
@@ -55,10 +55,10 @@ class PostgresqlTableDef < Base
     'float4' => {type: 'float4'},
     'smallint' => {type: 'int2'},
     'int2' => {type: 'int2'},
-    'smallserial' => {type: 'serial2'},  # TODO support
-    'serial2' => {type: 'serial2'}, # TODO support
-    'serial' => {type: 'serial4'},       # TODO support
-    'serial4' => {type: 'serial4'},       # TODO support
+    'smallserial' => {type: 'serial2'},
+    'serial2' => {type: 'serial2'},
+    'serial' => {type: 'serial4'},
+    'serial4' => {type: 'serial4'},
     'text' => {type: 'text'},
     'time' => {type: 'time'},
     'time without time zone' => {type: 'time'},

data/flydata-core/lib/flydata-core/table_def/redshift_table_def.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'flydata-core/errors'
+require 'flydata-core/table_def/value_conv'
 
 module FlydataCore
 module TableDef
@@ -218,7 +219,7 @@ EOS
 
     rs_type = if type_info[:use_params]
                 if params
-                  params = check_and_replace_max(params, Array(type_info[:max_size])) if type_info[:max_size]
+                  params = check_and_replace_max(params, Array(type_info[:max_size]), type) if type_info[:max_size]
                 else
                   #source data type has no parameter. use default parameters.
                   raise "No default pramameters for type:`#{column[:type]}`" unless type_info[:default_params]
@@ -272,7 +273,7 @@ EOS
         raise "default value of YEAR type must be 2 or 4-digit, value:'#{default_value}'"
       end
     elsif flydata_type.start_with?('money')
-      default_value = self.parse_money(remove_single_quote(default_value))
+      default_value = ValueConv.strip_currency_format(remove_single_quote(default_value))
     end
 
     case redshift_type
@@ -413,11 +414,29 @@ EOS
     text.gsub(/(['\\])/, "\\\\\\1")
   end
 
-  def self.check_and_replace_max(params, max_size_a)
+  def self.check_and_replace_max(params, max_size_a, flydata_type)
       final_params = []
-      params.split(",").each_with_index do |param, i|
-        final_params << (/\d+/.match(param) && max_size_a[i] && param.to_i > max_size_a[i].to_i ?
-                            max_size_a[i] : param)
+      case flydata_type
+      when 'numeric', 'numeric unsigned'
+        p = params.split(",")
+        raise "Wrong number of params for #{flydata_type} type." if p.length != max_size_a.length
+        above_decimal = p[0].to_i - p[1].to_i
+        below_decimal = p[1].to_i
+
+        # use max precision as the max number of above-dicimal digits
+        max_above_decimal = max_size_a[0]
+        final_above_decimal = above_decimal > max_above_decimal ? max_above_decimal : above_decimal
+
+        max_below_decimal = max_size_a[0] - final_above_decimal
+        max_below_decimal = max_size_a[1] if max_below_decimal > max_size_a[1]
+        final_below_decimal = below_decimal > max_below_decimal ? max_below_decimal : below_decimal
+
+        final_params << (final_above_decimal + final_below_decimal) << final_below_decimal
+      else
+        params.split(",").each_with_index do |param, i|
+          final_params << (/\d+/.match(param) && max_size_a[i] && param.to_i > max_size_a[i].to_i ?
+                              max_size_a[i] : param)
+        end
       end
       final_params.join(",")
   end
@@ -506,26 +525,6 @@ EOS
       value # Return the value as is
     end
   end
-
-  def self.parse_money(value)
-    # It's impossible to determine a decimal point of a currency sting without
-    # knowing its format.  Here, we're making a best effort guess to support
-    # as many currencty formats as we can without knowing the format.
-    value = value.gsub(/[^0-9\.,]/, '') # remove all chars but numbers and possible decimal point chars
-
-    whole_part = value
-    fractional_part = nil
-    if idx = value.rindex(/[\.,]/)
-      if idx == value.size - 3
-        # it's the decimal point with two digit fraction
-        whole_part = value[0...idx]
-        fractional_part = value[-2..-1]
-      end
-    end
-    value = whole_part.gsub(/[^0-9]/, '')
-    value += ".#{fractional_part}" if fractional_part
-    value
-  end
 end
 
 end

data/flydata-core/lib/flydata-core/table_def/value_conv.rb

@@ -0,0 +1,29 @@
+module FlydataCore
+module TableDef
+
+# Collection of methods to covert values
+module ValueConv
+  # currency format string -> decimal string
+  def self.strip_currency_format(value)
+    # It's impossible to determine a decimal point of a currency sting without
+    # knowing its format.  Here, we're making a best effort guess to support
+    # as many currency formats as we can without knowing the format.
+    value = value.gsub(/[^0-9\.,]/, '') # remove all chars but numbers and possible decimal point chars
+
+    whole_part = value
+    fractional_part = nil
+    if idx = value.rindex(/[\.,]/)
+      if idx == value.size - 3
+        # it's the decimal point with two digit fraction
+        whole_part = value[0...idx]
+        fractional_part = value[-2..-1]
+      end
+    end
+    value = whole_part.gsub(/[^0-9]/, '')
+    value += ".#{fractional_part}" if fractional_part
+    value
+  end
+end
+
+end
+end

data/flydata-core/spec/postgresql/compatibility_checker_spec.rb

@@ -23,7 +23,7 @@ SELECT
 FROM
   information_schema.tables
 WHERE
-  table_schema in (select current_schema)
+  table_schema in ((select current_schema))
   AND
   table_name in ('table_1','table_2','table_3');
 EOT
@@ -86,9 +86,9 @@ EOT
 SELECT
   t.table_name
 FROM
-  (select * from information_schema.tables where table_schema in (select current_schema) AND table_name in ('table_1','table_2','table_3')) t
+  (select * from information_schema.tables where table_schema in ((select current_schema)) AND table_name in ('table_1','table_2','table_3')) t
   LEFT OUTER JOIN
-  (select * from information_schema.table_constraints where table_schema in (select current_schema) AND table_name in ('table_1','table_2','table_3')) tc
+  (select * from information_schema.table_constraints where table_schema in ((select current_schema)) AND table_name in ('table_1','table_2','table_3')) tc
   USING (table_schema, table_name)
 GROUP BY
   t.table_schema, t.table_name

data/flydata-core/spec/postgresql/query_helper_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'flydata-core/postgresql/query_helper'
+
+module FlydataCore
+module Postgresql
+
+describe QueryHelper do
+  describe '.schema_as_value' do
+    subject { described_class.schema_as_value(schema) }
+
+    context 'when schema is empty' do
+      let(:schema) { '' }
+      it { is_expected.to eq('(select current_schema)') }
+    end
+
+    context 'when schema is nil' do
+      let(:schema) { nil }
+      it { is_expected.to eq('(select current_schema)') }
+    end
+
+    context 'when schema is a text' do
+      let(:schema) { 'test-schema'}
+      it { is_expected.to eq("'test-schema'") }
+    end
+  end
+end
+
+end
+end

data/flydata-core/spec/postgresql/snapshot_spec.rb

@@ -10,6 +10,15 @@ module FlydataCore
       describe '#initialize' do
         subject {  subject_object }
 
+        context 'when text is -' do
+          let(:snapshot_text) { '-' }
+          it { expect(subject.xmin).to be_nil }
+          it { expect(subject.xmax).to be_nil }
+          it { expect(subject.xip_list).to be_nil }
+          it { expect(subject.to_s).to eq('-') }
+          it { expect(subject).to be_empty }
+        end
+
         context 'when xip_list is empty' do
           let(:snapshot_text) { '10:18:' }
           it { expect(subject.xmin).to eq(10) }
@@ -27,6 +36,20 @@ module FlydataCore
         end
       end
 
+      describe '#empty?' do
+        subject { subject_object.empty? }
+
+        context 'when snapshot_txt is -' do
+          let(:snapshot_text) { '-' }
+          it { is_expected.to be(true) }
+        end
+
+        context 'when snapshot_txt is normal value' do
+          let(:snapshot_text) { '10:10:' }
+          it { is_expected.to be(false) }
+        end
+      end
+
       describe '#<=>' do
         def new_ss(txt)
           Snapshot.new(txt)
@@ -39,6 +62,8 @@ module FlydataCore
         it { expect(new_ss("10:18:") == new_ss("10:18:10,11,12")).to be(false) }
         it { expect(new_ss("10:18:10,11,12") == new_ss("10:18:10,11,12")).to be(true) }
         it { expect(new_ss("10:18:10,11,12") == new_ss("10:18:11,12")).to be(false) }
+        it { expect(new_ss("-") == new_ss("-")).to be(true) }
+        it { expect(new_ss("-") == new_ss("10:10:")).to be(false) }
 
         it { expect(new_ss("10:10:") > new_ss("10:10:")).to be(false) }
         it { expect(new_ss("10:10:") > new_ss("11:11:")).to be(false) }

data/flydata-core/spec/table_def/redshift_table_def_spec.rb

@@ -456,28 +456,56 @@ EOT
       end
 
       context 'with decimal column def' do
+        context 'when precision is exactly max allowed' do
+          let(:default_value) { "'4'" }
+          let(:default_value_sql) { default_value }
+          let(:not_null_default_sql) { " DEFAULT '0'" }
+          before do
+            column[:column] = "value"
+            column[:type] = "numeric(38,4)" #34+4 digits
+          end
+          let(:type_sql) { %Q|"value" numeric(38,4)| }
+
+          it_behaves_like *examples
+        end
+
         context 'when precision exceeds max allowed' do
           let(:default_value) { "'4'" }
           let(:default_value_sql) { default_value }
           let(:not_null_default_sql) { " DEFAULT '0'" }
           before do
             column[:column] = "value"
-            column[:type] = "numeric(65,30)"
+            column[:type] = "numeric(42,37)" #5+37 (precision 42) => 5+33 digits (precision 38)
+          end
+          # Preserve digits over decimal as much as possible,
+          # and truncate scale.
+          let(:type_sql) { %Q|"value" numeric(38,33)| }
+
+          it_behaves_like *examples
+        end
+
+        context 'when both precision and scale exceed max allowed' do #possible in postgresql
+          let(:default_value) { "'4'" }
+          let(:default_value_sql) { default_value }
+          let(:not_null_default_sql) { " DEFAULT '0'" }
+          before do
+            column[:column] = "value"
+            column[:type] = "numeric(1000,44)" #956+44 => 38+0 digits
           end
-          let(:type_sql) { %Q|"value" numeric(38,30)| }
+          let(:type_sql) { %Q|"value" numeric(38,0)| }
 
           it_behaves_like *examples
         end
-        context 'when scale exceeds max allowed' do #possible in postgresql
+
+        context 'when only scale exceed max allowed' do
           let(:default_value) { "'4'" }
           let(:default_value_sql) { default_value }
           let(:not_null_default_sql) { " DEFAULT '0'" }
           before do
             column[:column] = "value"
-            column[:type] = "numeric(100,44)"
+            column[:type] = "numeric(38,38)" #0+38 => 0+37 digits
           end
-          #this column accepts only 1 digit above decimal point. Other values such as 10 cause DDE.
-          let(:type_sql) { %Q|"value" numeric(38,37)| }
+          let(:type_sql) { %Q|"value" numeric(37,37)| }
 
           it_behaves_like *examples
         end
@@ -503,7 +531,7 @@ EOT
             column[:column] = "value"
             column[:type] = "numeric(65,44) unsigned"
           end
-          let(:type_sql) {%Q|"value" numeric(38,37)| }
+          let(:type_sql) {%Q|"value" numeric(38,17)| }
 
           it_behaves_like *examples
         end
@@ -1198,6 +1226,30 @@ EOS
         end
       end
     end
+    context 'with moeny type' do
+      let(:flydata_type) { "money" }
+      let(:redshift_type) { "money" }
+
+      context 'in dollar format' do
+        let(:default_value) { "'$2,392.40'" }
+        it { is_expected.to eq "'2392.40'" }
+      end
+
+      context 'in JPY format' do
+        let(:default_value) { "'JPY2,382,929'" }
+        it { is_expected.to eq "'2382929'" }
+      end
+
+      context 'in INR format' do
+        let(:default_value) { "'12,23,382.29'" }
+        it { is_expected.to eq "'1223382.29'" }
+      end
+
+      context 'in DKK format' do
+        let(:default_value) { "'10.382,29'" }
+        it { is_expected.to eq "'10382.29'" }
+      end
+    end
   end
 end
 

data/flydata-core/spec/table_def/value_conv_spec.rb

@@ -0,0 +1,33 @@
+module FlydataCore
+module TableDef
+
+require 'flydata-core/table_def/value_conv'
+
+describe ValueConv do
+  describe '.strip_currency_format' do
+    subject { described_class.strip_currency_format(value) }
+
+    context 'in dollar format' do
+      let(:value) { "$2,392.40" }
+      it { is_expected.to eq "2392.40" }
+    end
+
+    context 'in JPY format' do
+      let(:value) { "JPY2,382,929" }
+      it { is_expected.to eq "2382929" }
+    end
+
+    context 'in INR format' do
+      let(:value) { "12,23,382.29" }
+      it { is_expected.to eq "1223382.29" }
+    end
+
+    context 'in DKK format' do
+      let(:value) { "10.382,29" }
+      it { is_expected.to eq "10382.29" }
+    end
+  end
+end
+
+end
+end

data/lib/flydata/fluent-plugins/in_mysql_binlog_flydata.rb

@@ -219,7 +219,7 @@ EOS
     if @thread and @thread.alive?
       $log.info "Requesting stop Kodama"
       begin
-        @kodama_client.stop_request
+        @kodama_client.stop_request if @kodama_client
         if wait_till_safe_to_stop
           @thread.join
           $log.info "Kodama has stopped successfully"

data/lib/flydata/source_mysql/data_entry.rb

@@ -10,6 +10,7 @@ class DataEntry < Source::DataEntry
       tables: {},
       tables_append_only: {},
       host: {},
+      port: {},
       username: {},
       password: {encrypted: true},
       ssl_ca_content: {},

data/lib/flydata/source_postgresql/command/psql.rb

@@ -0,0 +1,48 @@
+require 'open3'
+require 'shellwords'
+require 'flydata/command/sync'
+
+# Command class must be in module Flydata::Command
+module Flydata
+  module Command
+
+    class Psql < Sync
+      def run(*args)
+        de = data_entry
+        cmd = generate_command(de['postgresql_data_entry_preference'], args)
+        return if cmd.to_s.empty?
+        $stderr.puts "command:#{cmd}" if FLYDATA_DEBUG
+        if $stdin.tty?
+          # interactive shell
+          system cmd
+        else
+          # execute queries given to $stdin
+          Open3.popen2e(cmd) do |i, o, wt|
+            $stdin.each_line do |line|
+              i.print line
+            end
+            i.close
+            while line = o.gets
+              print line
+            end
+          end
+        end
+      end
+
+      def generate_command(dbconf, args)
+        password = Shellwords.escape(dbconf['password'])
+        database = Shellwords.escape(dbconf['database'])
+        host = Shellwords.escape(dbconf['host'])
+        port = Shellwords.escape(dbconf['port'])
+        username = Shellwords.escape(dbconf['username'])
+        "PGCONNECT_TIMEOUT=5 PGPASSWORD=#{password} psql -d #{database} -h #{host} -p #{port} -U #{username}"
+      end
+
+      def flush; end
+      def reset; end
+      def skip; end
+      def generate_table_ddl; end
+    end
+
+  end
+end

data/lib/flydata/source_postgresql/data_entry.rb

@@ -10,6 +10,7 @@ class DataEntry < Source::DataEntry
       tables: {},
       tables_append_only: {},
       host: {},
+      port: {},
       username: {},
       password: {encrypted: true},
       schema: {},

data/lib/flydata/source_postgresql/generate_source_dump.rb

@@ -14,7 +14,7 @@ class GenerateSourceDump < Source::GenerateSourceDump
   include PostgresqlComponent
 
   def run_compatibility_check(dump_dir, backup_dir)
-    %w(host username database schema).each do |k|
+    %w(host username database).each do |k|
       if de_prefs[k].to_s.empty?
         raise "'#{k}' is required. Set the value in the conf file " +
               "-> #{Flydata::Preference::DataEntryPreference.conf_path(de)}"
@@ -34,21 +34,24 @@ class GenerateSourceDump < Source::GenerateSourceDump
     items
   end
 
-DUMP_SIZE_QUERY = <<EOS
+  DUMP_SIZE_QUERY = <<EOS
 SELECT sum(pg_total_relation_size(c.oid)) AS "total_size"
   FROM pg_class c
   LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-  WHERE nspname = $1 AND relname in (%s)
+  WHERE nspname = %{schema} AND relname in (%{tables})
 EOS
-  TABLE_PLACEHOLDER_START_NUM = 2 # because $1 is used by table_schema
 
   def dump_size(tables)
     cli = FlydataCore::Postgresql::PGClient.new(de_prefs)
 
-    query = FlydataCore::Postgresql::PGQuery.new(DUMP_SIZE_QUERY,
+    base_query = DUMP_SIZE_QUERY % {
+      schema: FlydataCore::Postgresql::QueryHelper.schema_as_value(de_prefs['schema']),
+      tables: '%s'   # Use binding parameters for tables
+    }
+    query = FlydataCore::Postgresql::PGQuery.new(base_query,
               placeholder_size: tables.size,
-              placeholder_start_num: TABLE_PLACEHOLDER_START_NUM)
-    res = cli.query(query, [de_prefs['schema']] + tables)
+              placeholder_start_num: 1)
+    res = cli.query(query, tables)
 
     res.first['total_size'].to_i
 

data/lib/flydata/source_postgresql/query_based_sync/diff_query_generator.rb

@@ -1,4 +1,6 @@
 require 'flydata-core/postgresql/pg_client'
+require 'flydata-core/table_def/postgresql_table_def'
+require 'flydata-core/table_def/value_conv'
 
 module Flydata
 module SourcePostgresql
@@ -107,7 +109,6 @@ EOS
     h[k] =
       case k
         when "bytea"; %Q['0x' || encode("%<column>s", 'hex') AS "%<column>s"]
-        when "money"; %Q["%<column>s"::numeric]
         else %Q["%<column>s"]
       end
   end
@@ -116,6 +117,8 @@ EOS
     h[k] =
       case k
       when "bit", "varbit"; -> (v) { v ? '%d' % v.to_i(2) : nil }
+      when "boolean"; -> (v) { FlydataCore::TableDef::PostgresqlTableDef::to_boolean(v) }
+      when "money"; -> (v) { FlydataCore::TableDef::ValueConv.strip_currency_format(v) }
       else
         nil
       end
@@ -126,7 +129,11 @@ EOS
   end
 
   def build_value_overriders(columns, types)
-    columns.each_with_index.inject({}) {|h, (c, i)| overrider = VALUE_OVERRIDERS[types[i]]; h[c] = overrider if overrider; h}
+    columns.each_with_index.inject({}) do |h, (c, i)|
+      overrider = VALUE_OVERRIDERS[types[i]]
+      h[c] = overrider if overrider
+      h
+    end
   end
 end
 

data/lib/flydata/source_postgresql/table_meta.rb

@@ -10,6 +10,8 @@ module SourcePostgresql
   # Fetch and keep table meta information
   #
   #  <table-name(Symbol)>:
+  #    table_name: <String>               # Table name
+  #    table_schema: <String> or nil      # Schema name
   #    primary_keys: <Array of String>    # Set primary key names. ex: ['group_id', 'category_id']
   #    pk_positions: <Array of Integer>   # Set the ordinal position of primary keys. ex: [1, 3]
   #    max_row_size: <Integer>            # byte, calculated based on column size
@@ -45,7 +47,7 @@ SELECT
   c.numeric_precision_radix,
   CASE WHEN c.data_type='money' THEN (
     SELECT CASE WHEN scale IS NULL THEN 0 ELSE scale END
-      FROM (SELECT length(substring(999999::money::char varying, '\.([0-9]+)$')) AS scale) s)
+      FROM (SELECT length(substring('999999'::money::char varying, '\.([0-9]+)$')) AS scale) s)
    ELSE c.numeric_scale END AS numeric_scale,
   c.datetime_precision,
   i.indisprimary AS is_primary
@@ -72,11 +74,12 @@ EOT
     DEFAULT_MAX_FETCH_RECORD_SIZE = 50000
     #DEFAULT_MAX_FETCH_RECORD_SIZE = 8
 
-    def initialize(dbconf, tables, schema = nil) # 64mb
+    def initialize(dbconf, tables, schema = nil)
       @dbconf = dbconf
       @database = dbconf[:dbname] || dbconf[:database] || dbconf['database']
       @tables = tables
-      @schema = schema || dbconf[:schema] || dbconf['schema']
+      @schema = (schema || dbconf[:schema] || dbconf['schema']).to_s.strip
+      @schema = @schema.empty? ? nil : @schema
     end
 
     attr_reader :current_snapshot
@@ -145,6 +148,7 @@ EOT
 
         t_meta.merge!(
           table_name: table_name.to_s,
+          table_schema: @schema,
           primary_keys: primary_keys,
           pk_positions: pk_positions,
           #max_row_size: max_row_size,                  #TODO: calculation

data/spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb

@@ -250,6 +250,7 @@ EOT
             'tables' => 'test_table,test_table_1,test_table_2',
             'tables_append_only' => 'test_table_3',
             'host' => 'localhost',
+            'port' => 3306,
             'username' => 'test_admin',
             'password' => 'test_password',
             'ssl_ca_content' => '',

data/spec/flydata/fluent-plugins/in_postgresql_query_based_flydata_spec.rb

@@ -17,7 +17,7 @@ module Fluent
   tables_append_only test_table_3
   position_file #{TEST_POSITION_FILE}
   host localhost
-  port 3306
+  port 5433
   username test_admin
   password test_password
   database test_db
@@ -50,6 +50,7 @@ EOT
             'tables' => 'test_table,test_table_1,test_table_2',
             'tables_append_only' => 'test_table_3',
             'host' => 'localhost',
+            'port' => 5433,
             'username' => 'test_admin',
             'password' => 'test_password',
             'schema' => 'test_schema',

data/spec/flydata/source_postgresql/query_based_sync/diff_query_generator_spec.rb

@@ -71,10 +71,11 @@ EOS
 
     context 'when columns includes a money type' do
       let(:value_data_type) { 'money(19,2)' }
-      it 'returns money values as numeric' do
+      it 'returns money values as is' do
         is_expected.to eq(<<EOS)
-SELECT "id", "value"::numeric FROM "public"."test_table" WHERE txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0002:0002:') AND NOT txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0001:0001:')  AND ("id" > $1) ORDER BY "id" LIMIT 100;
+SELECT "id", "value" FROM "public"."test_table" WHERE txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0002:0002:') AND NOT txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0001:0001:')  AND ("id" > $1) ORDER BY "id" LIMIT 100;
 EOS
+       expect(subject.value_overriders).to eq({"value" => DiffQueryGenerator::VALUE_OVERRIDERS['money']})
       end
     end
 
@@ -100,6 +101,17 @@ EOS
       end
     end
 
+    context 'when columns includes a boolean type' do
+      let(:value_data_type) { 'boolean' }
+      it 'returns a query with an overrider proc for boolean' do
+      result = subject
+      expect(result).to eq(<<EOS)
+SELECT "id", "value" FROM "public"."test_table" WHERE txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0002:0002:') AND NOT txid_visible_in_snapshot(xmin::TEXT::BIGINT, '0001:0001:')  AND ("id" > $1) ORDER BY "id" LIMIT 100;
+EOS
+       expect(result.value_overriders).to eq({"value" => DiffQueryGenerator::VALUE_OVERRIDERS['boolean']})
+      end
+    end
+
     context 'when from_sid is not given' do
       let(:from_sid) { nil }
       it { is_expected.to eq(<<EOS)
@@ -131,9 +143,17 @@ EOS
     subject { DiffQueryGenerator::VALUE_OVERRIDERS[type].call(value) }
 
     context 'when type is bit' do
-      let(:type) { 'bit' }
-      let(:value) { '0110000010' }
-      it { is_expected.to eq '386' }
+      context 'when value is not nil' do
+        let(:type) { 'bit' }
+        let(:value) { '0110000010' }
+        it { is_expected.to eq '386' }
+      end
+
+      context 'when value is nil' do
+        let(:type) { 'bit' }
+        let(:value) { nil }
+        it { is_expected.to eq nil }
+      end
     end
 
     context 'when type is varbit' do
@@ -143,10 +163,24 @@ EOS
       it { is_expected.to eq "18446744073709551613" }
     end
 
-    context 'when value is nil' do
-      let(:type) { 'bit' }
-      let(:value) { nil }
-      it { is_expected.to eq nil }
+    context 'when type is boolean' do
+      context 'when value is true' do
+        let(:type) { 'boolean' }
+        let(:value) { 't' }
+        it { is_expected.to eq true }
+      end
+
+      context 'when value is false' do
+        let(:type) { 'boolean' }
+        let(:value) { 'f' }
+        it { is_expected.to eq false }
+      end
+
+      context 'when value is nil' do
+        let(:type) { 'boolean' }
+        let(:value) { nil }
+        it { is_expected.to eq nil }
+      end
     end
   end
 
@@ -201,8 +235,8 @@ EOS
 
     context 'with a money column' do
       let(:value_data_type) { 'money' }
-      it 'generates a list which outputs money values as numeric' do
-        is_expected.to eq %Q["id", "value"::numeric]
+      it 'generates a list which outputs money values as is' do
+        is_expected.to eq %Q["id", "value"]
       end
     end
   end

data/spec/flydata/source_postgresql/table_meta_spec.rb

@@ -72,6 +72,25 @@ module Flydata::SourcePostgresql
           expect(subject[:table_a][:table_def]).to be_kind_of(FlydataCore::TableDef::Base)
         end
       end
+
+      context 'when schema is empty' do
+        let(:input_cli) { nil }
+        let(:schema) { nil }
+
+        before do
+          dbconf.delete(:schema)
+          dbconf.delete('schema')
+          allow(conn).to receive(:close)
+        end
+        it 'uses a current schema on query' do
+          expect(conn).to receive(:query) do |query|
+            expect(query).to match(/AND c.table_schema IN \(select current_schema\)/)
+            raw_columns
+          end
+          expect(conn).to receive(:query).with('SELECT txid_current_snapshot();').and_return(current_snapshots)
+          subject
+        end
+      end
     end
   end
 end

data/tmpl/redshift_postgresql_data_entry.conf.tmpl

@@ -0,0 +1,13 @@
+# Custom configuration for flydata client
+# This file is yaml format.  http://www.yaml.org/
+# Please remove '#' to enable custom option settings.
+postgresql_data_entry_preference:
+  #host: localhost
+  #port: 5432
+  #username: root
+  #password: abcd
+  #database: dev
+  #schema: public
+  #tables: users,country,rows
+  #tables_append_only: employees
+  #dump_dir: /mnt/dump

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -547,6 +547,7 @@ files:
 - flydata-core/lib/flydata-core/postgresql/compatibility_checker.rb
 - flydata-core/lib/flydata-core/postgresql/config.rb
 - flydata-core/lib/flydata-core/postgresql/pg_client.rb
+- flydata-core/lib/flydata-core/postgresql/query_helper.rb
 - flydata-core/lib/flydata-core/postgresql/snapshot.rb
 - flydata-core/lib/flydata-core/postgresql/source_pos.rb
 - flydata-core/lib/flydata-core/query_job.rb
@@ -560,6 +561,7 @@ files:
 - flydata-core/lib/flydata-core/table_def/postgresql_table_def.rb
 - flydata-core/lib/flydata-core/table_def/redshift_table_def.rb
 - flydata-core/lib/flydata-core/table_def/sync_redshift_table_def.rb
+- flydata-core/lib/flydata-core/table_def/value_conv.rb
 - flydata-core/lib/flydata-core/thread_context.rb
 - flydata-core/lib/flydata-core/wrapper_forwardable.rb
 - flydata-core/spec/config/user_maintenance_spec.rb
@@ -579,6 +581,7 @@ files:
 - flydata-core/spec/postgresql/compatibility_checker_spec.rb
 - flydata-core/spec/postgresql/config_spec.rb
 - flydata-core/spec/postgresql/pg_client_spec.rb
+- flydata-core/spec/postgresql/query_helper_spec.rb
 - flydata-core/spec/postgresql/snapshot_spec.rb
 - flydata-core/spec/postgresql/source_pos_spec.rb
 - flydata-core/spec/redshift/string_spec.rb
@@ -609,6 +612,7 @@ files:
 - flydata-core/spec/table_def/postgresql_table_def_spec.rb
 - flydata-core/spec/table_def/redshift_table_def_spec.rb
 - flydata-core/spec/table_def/sync_redshift_table_def_spec.rb
+- flydata-core/spec/table_def/value_conv_spec.rb
 - flydata-core/spec/wrapper_forwardable_spec.rb
 - flydata.gemspec
 - lib/fly_data_model.rb
@@ -735,6 +739,7 @@ files:
 - lib/flydata/source_mysql/sync_generate_table_ddl.rb
 - lib/flydata/source_mysql/table_ddl.rb
 - lib/flydata/source_mysql/table_meta.rb
+- lib/flydata/source_postgresql/command/psql.rb
 - lib/flydata/source_postgresql/data_entry.rb
 - lib/flydata/source_postgresql/generate_source_dump.rb
 - lib/flydata/source_postgresql/parse_dump_and_send.rb
@@ -843,6 +848,7 @@ files:
 - spec/spec_helper.rb
 - test-suite.sh
 - tmpl/redshift_mysql_data_entry.conf.tmpl
+- tmpl/redshift_postgresql_data_entry.conf.tmpl
 homepage: http://flydata.com/
 licenses:
 - All right reserved.