fix: time_partitioning and range_partition config error

Author: kitagry

README.md

@@ -469,7 +469,7 @@ out:
     range:
       start: 1
       end: 99999
-      range: 1
+      interval: 1
 ```
 
 ## Development

lib/embulk/output/bigquery.rb

@@ -228,12 +228,20 @@ def self.configure(config, schema, task_count)
           task['abort_on_error'] = (task['max_bad_records'] == 0)
         end
 
+        if task['time_partitioning'] && task['range_partitioning']
+          raise ConfigError.new "`time_partitioning` and `range_partitioning` cannot be used at the same time"
+        end
+
         if task['time_partitioning']
           unless task['time_partitioning']['type']
             raise ConfigError.new "`time_partitioning` must have `type` key"
           end
-        # If user specify range_partitioning, it should be used as is
-        elsif Helper.has_partition_decorator?(task['table']) && task['range_partitioning'].nil?
+        end
+
+        if Helper.has_partition_decorator?(task['table'])
+          if task['range_partitioning']
+            raise ConfigError.new "partition decorator doesn't support with `range_partition`"
+          end
           task['time_partitioning'] = {'type' => 'DAY'}
         end
 

lib/embulk/output/bigquery/bigquery_client.rb

@@ -411,7 +411,7 @@ def create_table_if_not_exists(table, dataset: nil, options: nil)
             dataset ||= @dataset
             options ||= {}
             options['time_partitioning'] ||= @task['time_partitioning']
-            if Helper.has_partition_decorator?(table) && @task['range_partitioning'].nil?
+            if Helper.has_partition_decorator?(table)
               options['time_partitioning'] ||= {'type' => 'DAY'}
               table = Helper.chomp_partition_decorator(table)
             end

test/test_configure.rb

@@ -300,6 +300,14 @@ def test_range_partitioning
         assert_raise { Bigquery.configure(config, schema, processor_count) }
       end
 
+      def test_time_and_range_partitioning_error
+        config = least_config.merge('time_partitioning' => {'type' => 'DAY'}, 'range_partitioning' => {'field' => 'foo', 'range' => { 'start' => 1, 'end' => 2, 'interval' => 1 }})
+        assert_raise { Bigquery.configure(config, schema, processor_count) }
+
+        config = least_config.merge('table' => 'table_name$20160912', 'range_partitioning' => {'field' => 'foo', 'range' => { 'start' => 1, 'end' => 2, 'interval' => 1 }})
+        assert_raise { Bigquery.configure(config, schema, processor_count) }
+      end
+
       def test_clustering
         config = least_config.merge('clustering' => {'fields' => ['field_a']})
         assert_nothing_raised { Bigquery.configure(config, schema, processor_count) }