Skip to content

Commit 4139ba5

Browse files
committed
Bump ORM versions under test
When necessary, also disable telemetry.
1 parent 02edd18 commit 4139ba5

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

node/sequelize/models/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
var fs = require('fs');
44
var Sequelize = require('sequelize-cockroachdb');
5-
var sequelize = new Sequelize(process.env.ADDR, {});
5+
var sequelize = new Sequelize(process.env.ADDR, {
6+
dialectOptions: {cockroachdbTelemetryDisabled : true}
7+
});
68
var DataTypes = Sequelize.DataTypes;
79

810
if (!Sequelize.supportsCockroachDB) {

node/sequelize/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": {
99
"body-parser": "^1.19.0",
1010
"express": "^4.17.1",
11-
"sequelize": "^5.22.4",
12-
"sequelize-cockroachdb": "^1.1.0"
11+
"sequelize": "^6.6.5",
12+
"sequelize-cockroachdb": "^6.0.2"
1313
}
1414
}

python/django/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ start:
44

55
deps:
66
pip3 install --upgrade setuptools
7-
pip3 install django==3.2 django-cockroachdb==3.2 psycopg2
7+
pip3 install django==3.2.8 django-cockroachdb==3.2.1 psycopg2

python/django/cockroach_example/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
'PASSWORD': '',
9191
'HOST' : 'localhost',
9292
'PORT' : port,
93+
'DISABLE_COCKROACHDB_TELEMETRY' : True,
9394
}
9495
}
9596

python/sqlalchemy/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# permissions and limitations under the License. See the AUTHORS file
1414
# for names of contributors.
1515

16-
ADDR ?= cockroachdb://root@localhost:26257/company_sqlalchemy?sslmode=disable
16+
ADDR ?= cockroachdb://root@localhost:26257/company_sqlalchemy?sslmode=disable&disable_cockroachdb_telemetry=true
1717

1818
.PHONY: start
1919
start:
@@ -23,4 +23,4 @@ start:
2323
deps:
2424
# To avoid permissions errors, the following should be run in a virtualenv
2525
# (preferred) or as root.
26-
pip3 install flask-sqlalchemy==2.5.1 sqlalchemy-cockroachdb==1.3.2 psycopg2
26+
pip3 install flask-sqlalchemy==2.5.1 sqlalchemy-cockroachdb==1.4.1 psycopg2

ruby/activerecord/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ end
77

88

99
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
10-
gem 'rails', '~> 5.2.4'
11-
gem 'activerecord-cockroachdb-adapter', '~> 5.2'
10+
gem 'rails', '~> 6.1.4.1'
11+
gem 'activerecord-cockroachdb-adapter', '~> 6.1.3'
1212
# Use Puma as the app server
1313
gem 'puma', '~> 3.12'
1414
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

ruby/activerecord/config/database.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ default: &default
33
port: 26257
44
host: localhost
55
user: root
6+
disable_cockroachdb_telemetry: true
67
#pool: 5
78
#timeout: 5000
89

0 commit comments

Comments
 (0)