flydata 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +5 -13
  2. data/VERSION +1 -1
  3. data/flydata.gemspec +4 -3
  4. data/lib/flydata/table_def/mysql_table_def.rb +2 -0
  5. data/spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb +0 -8
  6. data/spec/flydata/table_def/mysql_table_def_spec.rb +14 -0
  7. data/spec/flydata/table_def/mysqldump_test_unique_key2.dump +45 -0
  8. metadata +37 -36
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MDUwYjJjMGE3ZjRkYTU3YmNjNjdlY2Q0MTA4MjNlMjc4NzU1YjY1NA==
5
- data.tar.gz: !binary |-
6
- ZWQ0YTM5NzFiM2I3N2U5NGI2NDkwZmEyN2FjMzg3Njc4ODdiOGY3ZQ==
2
+ SHA1:
3
+ metadata.gz: c9c27e5aaf80b5e422b45d86afd09ce77e50e89a
4
+ data.tar.gz: cf978a752a26f2700aefc8882c9240278a75f051
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ODJlNDQ0ZGU2ZWM1ODk0MGM2MGIzZjY4YTZiOGE2NmZiOTdhOThmYWYwYWQ0
10
- MDc4ZjhkOWU3MjY5ODI4NWJkZWFjMmU2YmFkYmY5ZGM1NmI2ZDgzNWJhNDRm
11
- M2ZhNDU2NzAyMzI1OTc2NWY2MTVjMTQwM2IzNTNlYjBmYmRiMzc=
12
- data.tar.gz: !binary |-
13
- MjIxMGJjMTkxYmY4MjQ3ZmY3M2U2NDU1MjYxYWUyMDU4YWYxYmFmOTExY2Ey
14
- NWUzZmUwOWRhNWNjN2QwZTExYjRkNjU5OWViZTQ2NDJlYWU0ZmI5OWUwZmJl
15
- NmFiNTAxNGQzMzI0NGFhYTNlM2M1MTg3NmNjMjQ0NTVkOTg5YzM=
6
+ metadata.gz: bfc17189f1057dc79b2e1e969d005bcc587f28bff69340e444d2e6a11176688a7b26ef3074045b8df212a7b652a471b626d1a36a0e470064a9fdc5f2515e2170
7
+ data.tar.gz: 4578998bd6fb444acc86acb82ae141396f279661d4c5aacb4592c67540951eb5651212566ba3fd61f6259c4b0201ca9e16f4c9c64d98ab981557bd46e25389d6
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.0
1
+ 0.2.1
data/flydata.gemspec CHANGED
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: flydata 0.2.0 ruby lib
5
+ # stub: flydata 0.2.1 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "flydata"
9
- s.version = "0.2.0"
9
+ s.version = "0.2.1"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Koichi Fujikawa"]
14
- s.date = "2014-08-19"
14
+ s.date = "2014-08-20"
15
15
  s.description = "FlyData Command Line Interface"
16
16
  s.email = "sysadmin@flydata.co"
17
17
  s.executables = ["fdmysqldump", "flydata"]
@@ -97,6 +97,7 @@ Gem::Specification.new do |s|
97
97
  "spec/flydata/table_def/mysqldump_test_table_multi_pk.dump",
98
98
  "spec/flydata/table_def/mysqldump_test_table_no_pk.dump",
99
99
  "spec/flydata/table_def/mysqldump_test_unique_key.dump",
100
+ "spec/flydata/table_def/mysqldump_test_unique_key2.dump",
100
101
  "spec/flydata/table_def/mysqldump_test_unsigned.dump",
101
102
  "spec/flydata/table_def/redshift_table_def_spec.rb",
102
103
  "spec/flydata/util/encryptor_spec.rb",
data/lib/flydata/table_def/mysql_table_def.rb CHANGED
@@ -203,7 +203,9 @@ class MysqlTableDef
203
203
  private
204
204
 
205
205
  def self.parse_key(line, columns, type = :primary_key)
206
+ line = /\((?:`.*?`(?:,\s*)?)+\)/.match(line)[0]
206
207
  keys = line.scan(/`(.*?)`/).collect{|item| item[0]}
208
+
207
209
  keys.each do |key|
208
210
  column = columns.detect {|column|
209
211
  column[:column] === key
data/spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb CHANGED
@@ -282,9 +282,6 @@ EOT
282
282
 
283
283
  context 'when received alter table add column event' do
284
284
  it do
285
- # TODO Replace the expectation when enabling alter table
286
- expect_no_emitted_record(alter_table_add_column_event)
287
- =begin
288
285
  expect_emitted_records(alter_table_add_column_event, {
289
286
  type: :alter_table,
290
287
  table_name: "test_table",
@@ -295,15 +292,11 @@ EOT
295
292
  actions: [{
296
293
  action: :add_column, column: "sum", :type=>'int4'}],
297
294
  })
298
- =end
299
295
  end
300
296
  end
301
297
 
302
298
  context 'when received alter table drop column event' do
303
299
  it do
304
- # TODO Replace the expectation when enabling alter table
305
- expect_no_emitted_record(alter_table_drop_column_event)
306
- =begin
307
300
  expect_emitted_records(alter_table_drop_column_event, {
308
301
  type: :alter_table,
309
302
  table_name: "test_table",
@@ -314,7 +307,6 @@ EOT
314
307
  actions: [{
315
308
  action: :drop_column, column: "sum"}],
316
309
  })
317
- =end
318
310
  end
319
311
  end
320
312
 
data/spec/flydata/table_def/mysql_table_def_spec.rb CHANGED
@@ -161,6 +161,20 @@ describe MysqlTableDef do
161
161
  )
162
162
  end
163
163
  end
164
+
165
+ context 'when table has an unique key with a key name different than the column name' do
166
+ let(:dump_file_io) { file_io('mysqldump_test_unique_key2.dump')}
167
+ it 'should include unique in column def' do
168
+ expect(subject[:columns]).to eq(
169
+ [
170
+ {:column=>"id", :type=>"int4(11)", :auto_increment=>true, :not_null=>true, :primary_key=>true},
171
+ {:column=>"title", :type=>"varchar(768)", :unique=>true, :default=>nil},
172
+ {:column=>"name", :type=>"text"},
173
+ {:column=>"num", :type=>"int4(11)", :unique=>true, :default=>nil}
174
+ ]
175
+ )
176
+ end
177
+ end
164
178
  end
165
179
  end
166
180
 
data/spec/flydata/table_def/mysqldump_test_unique_key2.dump ADDED
@@ -0,0 +1,45 @@
1
+ -- MySQL dump 10.13 Distrib 5.5.37, for debian-linux-gnu (x86_64)
2
+ --
3
+ -- Host: localhost Database: flydata_sync
4
+ -- ------------------------------------------------------
5
+ -- Server version 5.5.37-0ubuntu0.12.04.1-log
6
+
7
+ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8
+ /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9
+ /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10
+ /*!40101 SET NAMES utf8 */;
11
+ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12
+ /*!40103 SET TIME_ZONE='+00:00' */;
13
+ /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
14
+ /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
15
+ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
16
+ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17
+
18
+ --
19
+ -- Table structure for table `sample1`
20
+ --
21
+
22
+ DROP TABLE IF EXISTS `sample1`;
23
+ /*!40101 SET @saved_cs_client = @@character_set_client */;
24
+ /*!40101 SET character_set_client = utf8 */;
25
+ CREATE TABLE `sample1` (
26
+ `id` int(11) NOT NULL AUTO_INCREMENT,
27
+ `title` varchar(256) DEFAULT NULL,
28
+ `name` text,
29
+ `num` int(11) DEFAULT NULL,
30
+ PRIMARY KEY (`id`),
31
+ UNIQUE KEY `title` (`title`),
32
+ UNIQUE KEY `index_num` (`num`)
33
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
34
+ /*!40101 SET character_set_client = @saved_cs_client */;
35
+ /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
36
+
37
+ /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
38
+ /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
39
+ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
40
+ /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
41
+ /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
42
+ /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
43
+ /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
44
+
45
+ -- Dump completed on 2014-07-15 10:07:45
metadata CHANGED
@@ -1,20 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flydata
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Koichi Fujikawa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-19 00:00:00.000000000 Z
11
+ date: 2014-08-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rest-client
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>='
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: 1.6.7
20
20
  - - ~>
@@ -24,7 +24,7 @@ dependencies:
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - ! '>='
27
+ - - '>='
28
28
  - !ruby/object:Gem::Version
29
29
  version: 1.6.7
30
30
  - - ~>
@@ -34,7 +34,7 @@ dependencies:
34
34
  name: i18n
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - ! '>='
37
+ - - '>='
38
38
  - !ruby/object:Gem::Version
39
39
  version: 0.6.5
40
40
  - - ~>
@@ -44,7 +44,7 @@ dependencies:
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ! '>='
47
+ - - '>='
48
48
  - !ruby/object:Gem::Version
49
49
  version: 0.6.5
50
50
  - - ~>
@@ -68,7 +68,7 @@ dependencies:
68
68
  name: json
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - ! '>='
71
+ - - '>='
72
72
  - !ruby/object:Gem::Version
73
73
  version: 1.8.0
74
74
  - - ~>
@@ -78,7 +78,7 @@ dependencies:
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - ! '>='
81
+ - - '>='
82
82
  - !ruby/object:Gem::Version
83
83
  version: 1.8.0
84
84
  - - ~>
@@ -88,7 +88,7 @@ dependencies:
88
88
  name: highline
89
89
  requirement: !ruby/object:Gem::Requirement
90
90
  requirements:
91
- - - ! '>='
91
+ - - '>='
92
92
  - !ruby/object:Gem::Version
93
93
  version: 1.6.19
94
94
  - - ~>
@@ -98,7 +98,7 @@ dependencies:
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ! '>='
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.6.19
104
104
  - - ~>
@@ -122,7 +122,7 @@ dependencies:
122
122
  name: ruby-binlog
123
123
  requirement: !ruby/object:Gem::Requirement
124
124
  requirements:
125
- - - ! '>='
125
+ - - '>='
126
126
  - !ruby/object:Gem::Version
127
127
  version: 1.0.1
128
128
  - - ~>
@@ -132,7 +132,7 @@ dependencies:
132
132
  prerelease: false
133
133
  version_requirements: !ruby/object:Gem::Requirement
134
134
  requirements:
135
- - - ! '>='
135
+ - - '>='
136
136
  - !ruby/object:Gem::Version
137
137
  version: 1.0.1
138
138
  - - ~>
@@ -142,7 +142,7 @@ dependencies:
142
142
  name: fluent-plugin-mysql-binlog
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - ! '>='
145
+ - - '>='
146
146
  - !ruby/object:Gem::Version
147
147
  version: 0.0.2
148
148
  - - ~>
@@ -152,7 +152,7 @@ dependencies:
152
152
  prerelease: false
153
153
  version_requirements: !ruby/object:Gem::Requirement
154
154
  requirements:
155
- - - ! '>='
155
+ - - '>='
156
156
  - !ruby/object:Gem::Version
157
157
  version: 0.0.2
158
158
  - - ~>
@@ -162,7 +162,7 @@ dependencies:
162
162
  name: mysql2
163
163
  requirement: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - ! '>='
165
+ - - '>='
166
166
  - !ruby/object:Gem::Version
167
167
  version: 0.3.11
168
168
  - - ~>
@@ -172,7 +172,7 @@ dependencies:
172
172
  prerelease: false
173
173
  version_requirements: !ruby/object:Gem::Requirement
174
174
  requirements:
175
- - - ! '>='
175
+ - - '>='
176
176
  - !ruby/object:Gem::Version
177
177
  version: 0.3.11
178
178
  - - ~>
@@ -182,7 +182,7 @@ dependencies:
182
182
  name: slop
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ! '>='
185
+ - - '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: 3.4.6
188
188
  - - ~>
@@ -192,7 +192,7 @@ dependencies:
192
192
  prerelease: false
193
193
  version_requirements: !ruby/object:Gem::Requirement
194
194
  requirements:
195
- - - ! '>='
195
+ - - '>='
196
196
  - !ruby/object:Gem::Version
197
197
  version: 3.4.6
198
198
  - - ~>
@@ -202,7 +202,7 @@ dependencies:
202
202
  name: treetop
203
203
  requirement: !ruby/object:Gem::Requirement
204
204
  requirements:
205
- - - ! '>='
205
+ - - '>='
206
206
  - !ruby/object:Gem::Version
207
207
  version: 1.5.3
208
208
  - - ~>
@@ -212,7 +212,7 @@ dependencies:
212
212
  prerelease: false
213
213
  version_requirements: !ruby/object:Gem::Requirement
214
214
  requirements:
215
- - - ! '>='
215
+ - - '>='
216
216
  - !ruby/object:Gem::Version
217
217
  version: 1.5.3
218
218
  - - ~>
@@ -222,7 +222,7 @@ dependencies:
222
222
  name: jeweler
223
223
  requirement: !ruby/object:Gem::Requirement
224
224
  requirements:
225
- - - ! '>='
225
+ - - '>='
226
226
  - !ruby/object:Gem::Version
227
227
  version: 1.8.8
228
228
  - - ~>
@@ -232,7 +232,7 @@ dependencies:
232
232
  prerelease: false
233
233
  version_requirements: !ruby/object:Gem::Requirement
234
234
  requirements:
235
- - - ! '>='
235
+ - - '>='
236
236
  - !ruby/object:Gem::Version
237
237
  version: 1.8.8
238
238
  - - ~>
@@ -256,7 +256,7 @@ dependencies:
256
256
  name: timecop
257
257
  requirement: !ruby/object:Gem::Requirement
258
258
  requirements:
259
- - - ! '>='
259
+ - - '>='
260
260
  - !ruby/object:Gem::Version
261
261
  version: 0.7.1
262
262
  - - ~>
@@ -266,7 +266,7 @@ dependencies:
266
266
  prerelease: false
267
267
  version_requirements: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - ! '>='
269
+ - - '>='
270
270
  - !ruby/object:Gem::Version
271
271
  version: 0.7.1
272
272
  - - ~>
@@ -276,7 +276,7 @@ dependencies:
276
276
  name: sqlite3
277
277
  requirement: !ruby/object:Gem::Requirement
278
278
  requirements:
279
- - - ! '>='
279
+ - - '>='
280
280
  - !ruby/object:Gem::Version
281
281
  version: 1.3.9
282
282
  - - ~>
@@ -286,7 +286,7 @@ dependencies:
286
286
  prerelease: false
287
287
  version_requirements: !ruby/object:Gem::Requirement
288
288
  requirements:
289
- - - ! '>='
289
+ - - '>='
290
290
  - !ruby/object:Gem::Version
291
291
  version: 1.3.9
292
292
  - - ~>
@@ -296,7 +296,7 @@ dependencies:
296
296
  name: ruby-prof
297
297
  requirement: !ruby/object:Gem::Requirement
298
298
  requirements:
299
- - - ! '>='
299
+ - - '>='
300
300
  - !ruby/object:Gem::Version
301
301
  version: 0.15.1
302
302
  - - ~>
@@ -306,7 +306,7 @@ dependencies:
306
306
  prerelease: false
307
307
  version_requirements: !ruby/object:Gem::Requirement
308
308
  requirements:
309
- - - ! '>='
309
+ - - '>='
310
310
  - !ruby/object:Gem::Version
311
311
  version: 0.15.1
312
312
  - - ~>
@@ -316,7 +316,7 @@ dependencies:
316
316
  name: activemodel
317
317
  requirement: !ruby/object:Gem::Requirement
318
318
  requirements:
319
- - - ! '>='
319
+ - - '>='
320
320
  - !ruby/object:Gem::Version
321
321
  version: 4.0.0
322
322
  - - ~>
@@ -326,7 +326,7 @@ dependencies:
326
326
  prerelease: false
327
327
  version_requirements: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - ! '>='
329
+ - - '>='
330
330
  - !ruby/object:Gem::Version
331
331
  version: 4.0.0
332
332
  - - ~>
@@ -336,7 +336,7 @@ dependencies:
336
336
  name: activerecord
337
337
  requirement: !ruby/object:Gem::Requirement
338
338
  requirements:
339
- - - ! '>='
339
+ - - '>='
340
340
  - !ruby/object:Gem::Version
341
341
  version: 4.0.0
342
342
  - - ~>
@@ -346,7 +346,7 @@ dependencies:
346
346
  prerelease: false
347
347
  version_requirements: !ruby/object:Gem::Requirement
348
348
  requirements:
349
- - - ! '>='
349
+ - - '>='
350
350
  - !ruby/object:Gem::Version
351
351
  version: 4.0.0
352
352
  - - ~>
@@ -356,7 +356,7 @@ dependencies:
356
356
  name: protected_attributes
357
357
  requirement: !ruby/object:Gem::Requirement
358
358
  requirements:
359
- - - ! '>='
359
+ - - '>='
360
360
  - !ruby/object:Gem::Version
361
361
  version: 1.0.8
362
362
  - - ~>
@@ -366,7 +366,7 @@ dependencies:
366
366
  prerelease: false
367
367
  version_requirements: !ruby/object:Gem::Requirement
368
368
  requirements:
369
- - - ! '>='
369
+ - - '>='
370
370
  - !ruby/object:Gem::Version
371
371
  version: 1.0.8
372
372
  - - ~>
@@ -461,6 +461,7 @@ files:
461
461
  - spec/flydata/table_def/mysqldump_test_table_multi_pk.dump
462
462
  - spec/flydata/table_def/mysqldump_test_table_no_pk.dump
463
463
  - spec/flydata/table_def/mysqldump_test_unique_key.dump
464
+ - spec/flydata/table_def/mysqldump_test_unique_key2.dump
464
465
  - spec/flydata/table_def/mysqldump_test_unsigned.dump
465
466
  - spec/flydata/table_def/redshift_table_def_spec.rb
466
467
  - spec/flydata/util/encryptor_spec.rb
@@ -477,12 +478,12 @@ require_paths:
477
478
  - lib
478
479
  required_ruby_version: !ruby/object:Gem::Requirement
479
480
  requirements:
480
- - - ! '>='
481
+ - - '>='
481
482
  - !ruby/object:Gem::Version
482
483
  version: '0'
483
484
  required_rubygems_version: !ruby/object:Gem::Requirement
484
485
  requirements:
485
- - - ! '>='
486
+ - - '>='
486
487
  - !ruby/object:Gem::Version
487
488
  version: '0'
488
489
  requirements: []