Merge pull request #136 from rafiss/bump-orm-versions

Bump ORM versions under test

Author: rafiss

Makefile

@@ -41,5 +41,4 @@ deps:
 	$(MAKE) deps -C ./node/sequelize
 	$(MAKE) deps -C ./python/sqlalchemy
 	$(MAKE) deps -C ./ruby/activerecord
-	$(MAKE) deps -C ./ruby/ar4
 	$(MAKE) deps -C ./python/django

node/sequelize/models/index.js

@@ -2,7 +2,9 @@
 
 var fs        = require('fs');
 var Sequelize = require('sequelize-cockroachdb');
-var sequelize = new Sequelize(process.env.ADDR, {});
+var sequelize = new Sequelize(process.env.ADDR, {
+  dialectOptions: {cockroachdbTelemetryDisabled : true}
+});
 var DataTypes = Sequelize.DataTypes;
 
 if (!Sequelize.supportsCockroachDB) {

node/sequelize/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "body-parser": "^1.19.0",
     "express": "^4.17.1",
-    "sequelize": "^5.22.4",
-    "sequelize-cockroachdb": "^1.1.0"
+    "sequelize": "^6.6.5",
+    "sequelize-cockroachdb": "^6.0.2"
   }
 }

python/django/Makefile

@@ -4,4 +4,4 @@ start:
 
 deps:
 	pip3 install --upgrade setuptools
-	pip3 install django==3.2 django-cockroachdb==3.2 psycopg2
+	pip3 install django==3.2.8 django-cockroachdb==3.2.1 psycopg2

python/django/cockroach_example/settings.py

@@ -90,6 +90,7 @@
         'PASSWORD': '',
         'HOST' : 'localhost',
         'PORT' : port,
+        'DISABLE_COCKROACHDB_TELEMETRY' : True,
     }
 }
 

python/sqlalchemy/Makefile

@@ -13,7 +13,7 @@
 # permissions and limitations under the License. See the AUTHORS file
 # for names of contributors.
 
-ADDR ?= cockroachdb://root@localhost:26257/company_sqlalchemy?sslmode=disable
+ADDR ?= cockroachdb://root@localhost:26257/company_sqlalchemy?sslmode=disable&disable_cockroachdb_telemetry=true
 
 .PHONY: start
 start:
@@ -23,4 +23,4 @@ start:
 deps:
 	# To avoid permissions errors, the following should be run in a virtualenv
 	# (preferred) or as root.
-	pip3 install flask-sqlalchemy==2.5.1 sqlalchemy-cockroachdb==1.3.2 psycopg2
+	pip3 install flask-sqlalchemy==2.5.1 sqlalchemy-cockroachdb==1.4.1 psycopg2

ruby/activerecord/Gemfile

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

ruby/activerecord/config/database.yml

@@ -3,6 +3,7 @@ default: &default
   port: 26257
   host: localhost
   user: root
+  disable_cockroachdb_telemetry: true
   #pool: 5
   #timeout: 5000