Skip to content

Commit fe26f9a

Browse files
committed
various changes
1 parent 3ff8afa commit fe26f9a

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.6.4

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG TARGET_VERSION=2.6.3
22

3-
FROM wpolicarpo/activerecord-sqlserver-adapter:${TARGET_VERSION}
3+
FROM nemesit/activerecord-sqlserver-adapter:${TARGET_VERSION}
44

55
ENV WORKDIR /activerecord-sqlserver-adapter
66

Gemfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,23 @@ else
3333
ver
3434
end
3535
end
36-
gem 'rails', git: "git://github.com/rails/rails.git", tag: "v#{version}"
36+
37+
gem 'rails', git: "git://github.com/rails/rails.git", tag: "v6.0.2.1"
38+
# gem 'rails', git: "git://github.com/rails/rails.git", tag: "v#{version}"
3739
end
3840

3941
if ENV['AREL']
4042
gem 'arel', path: ENV['AREL']
4143
end
4244

4345
group :tinytds do
44-
if ENV['TINYTDS_SOURCE']
45-
gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
46-
elsif ENV['TINYTDS_VERSION']
47-
gem 'tiny_tds', ENV['TINYTDS_VERSION']
48-
else
49-
gem 'tiny_tds'
50-
end
46+
#if ENV['TINYTDS_SOURCE']
47+
# gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
48+
#elsif ENV['TINYTDS_VERSION']
49+
# gem 'tiny_tds', ENV['TINYTDS_VERSION']
50+
#else
51+
gem 'tiny_tds', git: 'https://github.com/nemesit/tiny_tds.git'
52+
#end
5153
end
5254

5355
group :development do

activerecord-sqlserver-adapter.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
1616
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
1717
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1818
spec.require_paths = ['lib']
19-
spec.add_dependency 'activerecord', '~> 6.0.0.beta3'
19+
spec.add_dependency 'activerecord', '~> 6.0.2.1'
2020
spec.add_dependency 'tiny_tds'
2121
end

docker-compose.ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "2.2"
22
services:
33
database:
4-
image: metaskills/mssql-server-linux-rails
4+
image: nemesit/mssql-server-linux-rails
55
ci:
66
environment:
77
- ACTIVERECORD_UNITTEST_HOST=database

0 commit comments

Comments
 (0)