lib/ridgepole/diff.rb in ridgepole-1.0.3 vs lib/ridgepole/diff.rb in ridgepole-1.0.4
- old
+ new
@@ -504,10 +504,18 @@
if @options[:skip_column_comment_change]
attrs1.fetch(:options).delete(:comment)
attrs2.fetch(:options).delete(:comment)
end
+ if attrs1[:options][:as] != attrs2[:options][:as] && attrs1[:options].fetch(:as, '').delete(' ') == attrs2[:options].fetch(:as, '').delete(' ')
+ @logger.warn(<<-MSG)
+[WARNING] Same expressions but only differed by white spaces were detected. This operation may fail.
+ Before: '#{attrs1[:options][:as]}'
+ After : '#{attrs2[:options][:as]}'
+ MSG
+ end
+
attrs1 == attrs2
end
def normalize_default_proc_options!(opts1, opts2)
if opts1[:default].is_a?(Proc) && opts2[:default].is_a?(Proc)
@@ -647,10 +655,10 @@
from_partitions = (from[:partition_definitions] || []).index_by { |partition| partition[:name] }
to_partitions = (to[:partition_definitions] || []).index_by { |partition| partition[:name] }
(from_partitions.keys - to_partitions.keys).each do |name|
partition_definitions_delta[:delete] ||= {}
- partition_definitions_delta[:delete][name] = attrs.merge(valuve: from_partitions[name][:values])
+ partition_definitions_delta[:delete][name] = attrs.merge(values: from_partitions[name][:values])
end
(to_partitions.keys - from_partitions.keys).each do |name|
partition_definitions_delta[:add] ||= {}
partition_definitions_delta[:add][name] = attrs.merge(values: to_partitions[name][:values])