Skip to content

Commit f7410cd

Browse files
committed
Tuning versions and taking to Ruby 2.1.7 as minimum
1 parent fde9043 commit f7410cd

File tree

7 files changed

+48
-34
lines changed

7 files changed

+48
-34
lines changed

Diff for: .gitignore

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
test/fixtures/test*.sql
2-
config/database.yml
3-
pkg
4-
.rvmrc
5-
.bundle
1+
*.gem
62
*.sql
3+
.bundle
4+
.rvmrc
5+
config/database.yml
76
Gemfile.lock
7+
pkg
8+
test/fixtures/test*.sql

Diff for: .travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
sudo: false
12
language: ruby
23
rvm:
3-
- 1.9.3
4+
- "2.1.7"
5+
- "2.2.3"

Diff for: Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '1.9.3'
1+
ruby '2.1.7'
22
source 'https://rubygems.org'
33

44
gem 'rake', '~> 10.3'
@@ -13,7 +13,7 @@ platforms :jruby do
1313
end
1414

1515
platforms :mri do
16-
gem 'pg', '~> 0.17'
16+
gem 'pg', '~> 0.18'
1717
end
1818

1919
gem 'test-unit'

Diff for: README.md

+13-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
[![Build Status](https://travis-ci.org/maxlapshin/mysql2postgres.svg)](https://travis-ci.org/maxlapshin/mysql2postgres)
44
[![Dependency Status](https://gemnasium.com/maxlapshin/mysql2postgres.svg)](https://gemnasium.com/maxlapshin/mysql2postgres)
55

6-
MRI or jruby supported.
6+
MRI or jruby supported. The minimum Ruby version supported in `master` branch is `2.1.7`,
7+
and the next release will have the same requirement.
78

8-
With a bit of a modified rails database.yml configuration, you can integrate mysql-to-postgres into a project.
9+
With a bit of a modified rails `database.yml` configuration, you can integrate `mysql-to-postgres`into a project.
910

1011
## Installation
1112

13+
**Currently failing, see #81...**
14+
1215
### Via RubyGems
1316

1417
```sh
@@ -22,7 +25,7 @@ git clone https://github.com/maxlapshin/mysql2postgres.git
2225
cd mysql2postgres
2326
bundle install
2427
gem build mysqltopostgres.gemspec
25-
sudo gem install mysqltopostgres-0.2.20.gem
28+
sudo gem install mysqltopostgres-0.3.0.gem
2629
```
2730

2831
## Sample Configuration
@@ -102,3 +105,10 @@ mysql2psql:
102105
```
103106
104107
Please note that the MySQL connection will be using socket in case the host is not defined (`nil`) or it is `'localhost'`.
108+
109+
## Testing
110+
111+
112+
## License
113+
114+
Licensed under [the MIT license](MIT-LICENSE).

Diff for: Rakefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ begin
2727
'Jacob Coby <[email protected]>',
2828
'Neszt Tibor <[email protected]>',
2929
'Miroslav Kratochvil <[email protected]>',
30-
'Paul Gallagher <[email protected]>'
30+
'Paul Gallagher <[email protected]>',
31+
'Juga Paazmaya <[email protected]>'
3132
]
32-
gem.add_dependency 'mysql', '= 2.8.1'
33-
gem.add_dependency 'pg', '= 0.9.0'
34-
gem.add_development_dependency 'test-unit', '>= 2.1.1'
33+
gem.add_dependency 'mysql-pr', '~> 2.9'
34+
gem.add_dependency 'postgres-pr', '~> 0.6'
35+
gem.add_development_dependency 'test-unit', '~> 2.1'
3536
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
3637
end
3738
Jeweler::GemcutterTasks.new

Diff for: config/default.database.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ default: &default
66
password: default
77
host: 127.0.0.1
88
template: template_gis
9-
gis_schema_name: gis_tmp
10-
9+
gis_schema_name: gis_tmp
10+
1111
development: &development
1212
<<: *default
1313
database: default_development
@@ -30,15 +30,15 @@ mysql_data_source: &pii
3030
mysql2psql:
3131
mysql:
3232
<<: *pii
33-
33+
3434
destination:
3535
production:
3636
<<: *production
37-
test:
37+
test:
3838
<<: *test
3939
development:
4040
<<: *development
41-
41+
4242
tables:
4343
- countries
4444
- samples
@@ -59,11 +59,11 @@ mysql2psql:
5959
preserve_order: true
6060

6161
remove_dump_file: true
62-
62+
6363
dump_file_directory: /tmp
64-
64+
6565
report_status: json # false, json, xml
66-
66+
6767
# If clear_schema is true, the public schema will be recreated before conversion
6868
# The import will fail if both clear_schema and suppress_ddl are true.
6969
clear_schema: false

Diff for: mysqltopostgres.gemspec

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Gem::Specification.new do |s|
33
s.name = 'mysqltopostgres'
4-
s.version = '0.2.20'
4+
s.version = '0.3.0'
55
s.licenses = ['MIT']
66

77
s.authors = [
@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
2222
'Peter Clark <[email protected]>',
2323
'Juga Paazmaya <[email protected]>'
2424
]
25-
s.date = '2014-11-19'
25+
s.date = '2015-11-26'
2626
s.default_executable = 'mysqltopostgres'
2727
s.description = 'Translates MySQL -> PostgreSQL'
28-
s.email = '[email protected]'
28+
s.email = '[email protected]'
2929
s.executables = ['mysqltopostgres']
3030

3131
s.files = [
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
6565
s.homepage = 'https://github.com/maxlapshin/mysql2postgres'
6666
s.rdoc_options = ['--charset=UTF-8']
6767
s.require_paths = ['lib']
68-
s.rubygems_version = '1.3.7'
68+
s.rubygems_version = '2.4.0'
6969
s.summary = 'MySQL to PostgreSQL Data Translation'
7070
s.test_files = [
7171
'test/integration/convert_to_db_test.rb',
@@ -81,15 +81,15 @@ Gem::Specification.new do |s|
8181
'test/units/postgres_file_writer_test.rb'
8282
]
8383

84-
s.add_dependency('mysql-pr', ['~> 2.9'])
85-
s.add_dependency('postgres-pr', ['~> 0.6'])
86-
s.add_dependency('activerecord', ['~> 3.2'])
87-
s.add_dependency('test-unit', ['~> 2.1'])
84+
s.add_dependency('mysql-pr', ['~> 2.9'])
85+
s.add_dependency('postgres-pr', ['~> 0.6'])
86+
s.add_dependency('test-unit', ['~> 2.1'])
8887

8988
if RUBY_PLATFORM == 'java'
90-
s.add_dependency('activerecord-jdbc-adapter', ['>= 1.2.2'])
91-
s.add_dependency('activerecord-jdbcpostgresql-adapter', ['>= 1.2.2'])
92-
s.add_dependency('activerecord-jdbcsqlite3-adapter', ['>= 1.2.2'])
89+
s.add_dependency('activerecord', ['~> 3.2'])
90+
s.add_dependency('jdbc-postgres', ['~> 9.4'])
91+
s.add_dependency('activerecord-jdbc-adapter', ['~> 1.2'])
92+
s.add_dependency('activerecord-jdbcpostgresql-adapter', ['~> 1.2'])
9393
end
9494

9595
end

0 commit comments

Comments
 (0)