Skip to content

Commit 09d9210

Browse files
authored
Merge branch 'rails-sqlserver:main' into master
2 parents 7793e06 + 702d212 commit 09d9210

File tree

168 files changed

+6388
-3340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+6388
-3340
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true

.github/issue_template.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Issue
2+
<!-- Give a brief summary of the issue. -->
3+
4+
## Expected behavior
5+
<!-- Tell us what should happen -->
6+
7+
## Actual behavior
8+
<!-- Tell us what happens instead -->
9+
10+
## How to reproduce
11+
<!-- See https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/wiki/How-to-report-a-bug -->
12+
13+
## Details
14+
15+
- **Rails version**: `x.x.x`
16+
- **SQL Server adapter version**: `x.x.x`
17+
- **TinyTDS version**: `x.x.x`
18+
- **FreeTDS details**:
19+
20+
```
21+
run `tsql -C` and paste here the output.
22+
```
23+

.github/workflows/ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
name: Run test suite
8+
runs-on: ubuntu-latest
9+
10+
env:
11+
COMPOSE_FILE: docker-compose.ci.yml
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
ruby:
17+
- 2.7.8
18+
- 3.0.6
19+
- 3.1.4
20+
- 3.2.2
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v2
25+
26+
- name: Build docker images
27+
run: docker-compose build --build-arg TARGET_VERSION=${{ matrix.ruby }}
28+
29+
- name: Run tests
30+
run: docker-compose run ci

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ debug.log
33
.DS_Store
44
pkg/
55
doc/
6+
db/
67
*.gem
78
.bundle
89
Gemfile.lock

.rubocop.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
AllCops:
2+
TargetRubyVersion: 2.5
3+
4+
Layout/LineLength:
5+
Max: 120
6+
7+
Naming/AccessorMethodName:
8+
Enabled: false
9+
10+
Naming/FileName:
11+
Exclude:
12+
- lib/activerecord-sqlserver-adapter.rb
13+
14+
Naming/MethodName:
15+
IgnoredPatterns:
16+
- visit_.*
17+
- primary_Key_From_Table
18+
- table_From_Statement
19+
- distinct_One_As_One_Is_So_Not_Fetch
20+
- make_Fetch_Possible_And_Deterministic
21+
22+
Naming/MethodParameterName:
23+
Enabled: false
24+
25+
Naming/PredicateName:
26+
Enabled: false
27+
28+
Style/StringLiterals:
29+
EnforcedStyle: double_quotes

.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

BACKERS.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
1-
## v5.2.0
2-
3-
- #686 sql_for_insert set table name in case when pk is not nil
4-
5-
## v5.2.0.rc2
6-
7-
#### Fixed
8-
9-
- #681 change_column_null should not clear other column attributes. Fixes #582.
10-
- #684 Fix explain with array conditions. Fixes #673.
11-
12-
## v5.2.0.rc1
13-
14-
#### Fixed
15-
16-
- #638 Don't disable referential integrity for the same table twice.
17-
- #646 Make String equality check work for Type::Data values. Fixes #645.
18-
- #671 Fix tinyint columns schema migration. Fixes #670.
1+
## Unreleased
192

203
#### Changed
214

22-
- #642 Added with (nolock) hint to information_schema.views.
5+
#### Fixed
236

7+
#### Added
248

25-
Please check [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/5-1-stable/CHANGELOG.md) for previous changes.
9+
Please check [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-0-stable/CHANGELOG.md) for previous changes.

Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

Dockerfile.ci

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
ARG TARGET_VERSION=3.2.1
2+
3+
FROM ghcr.io/rails-sqlserver/activerecord-sqlserver-adapter:${TARGET_VERSION}
4+
5+
ENV WORKDIR /activerecord-sqlserver-adapter
6+
7+
RUN mkdir -p $WORKDIR
8+
WORKDIR $WORKDIR
9+
10+
COPY . $WORKDIR
11+
12+
RUN RAILS_MAIN=1 bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
13+
14+
CMD ["sh"]

0 commit comments

Comments
 (0)