convergence 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 31b591ac5f9afe5f6f73bdbbbb42378929607426
4
- data.tar.gz: 3a86d9868b9c825d7b4ddc1b3dfb6a5997950897
3
+ metadata.gz: e2dc3b318f0911fa9ec9b361bf6ab5aa01aad54f
4
+ data.tar.gz: 874249e5572387b564a825df6b2b5536adf84611
5
5
  SHA512:
6
- metadata.gz: bb0c1a6e8f2456dbbfd858efcf3e0bac1ce10d75e6098eea8cc9835d5f247b4e677e51b4b0ddc671e311c7773c9f3ac7ffbedeea39248d5cc6a8679c7bac0fbf
7
- data.tar.gz: 252b96343e6936c1850446c0ab3b43efc2db1d734fa7b841e64eda9b4644b18f4a053cda78806d2e7e369f948c67c489e51c870af7f8478b503c4b063637960b
6
+ metadata.gz: aa628e7186e0261f009da8f65a67a907b860f4c10bb8400ced3ac38db56df0b41e20f8a738d08cf02994ea29addabd8b9ac7b60b90805c5c1582f1db4bc134b8
7
+ data.tar.gz: 4d1da1a6b2874ff92597ca08a799a9d06ab5480bbe1d473b7b37e5fec01f5c39f9bdcc342ff46386f07ce868bc4e73d403ebc2649d08858641997c7f6584cecc
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- convergence (0.0.8)
4
+ convergence (0.0.9)
5
5
  diff-lcs
6
6
  diffy
7
7
  mysql2
@@ -135,9 +135,10 @@ class Convergence::DefaultParameter::MysqlDefaultParameter
135
135
  .merge(column.options)
136
136
  if TEXT_TYPE.include?(type)
137
137
  character_set = table.table_options[:default_charset] || DEFAULT_TABLE_PARAMETERS[:default_charset]
138
- parameters = parameters.merge(
138
+ parameters = {
139
139
  character_set: character_set,
140
- collate: table.table_options[:collate] || DEFAULT_COLLATE_NAME[character_set.downcase])
140
+ collate: table.table_options[:collate] || DEFAULT_COLLATE_NAME[character_set.downcase]
141
+ }.merge(parameters)
141
142
  end
142
143
  column.options = parameters
143
144
  end
@@ -1,3 +1,3 @@
1
1
  module Convergence
2
- VERSION = '0.0.8'
2
+ VERSION = '0.0.9'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: convergence
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shinsuke Nishio
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-05 00:00:00.000000000 Z
11
+ date: 2015-06-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mysql2