Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ignore_tests/shared/telemetry.txt

This file was deleted.

2 changes: 0 additions & 2 deletions source/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ if (semver.satisfies(sequelizeVersion, '<=4')) {
);
}

require('./telemetry.js')

//// [1] Override the `upsert` query method from Sequelize v5 to make it work with CockroachDB
if (semver.satisfies(sequelizeVersion, '5.x')) {
require('./patch-upsert-v5');
Expand Down
31 changes: 0 additions & 31 deletions source/telemetry.js

This file was deleted.

21 changes: 0 additions & 21 deletions source/version_helper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const semver = require('semver');
const { version, release } = require('sequelize/package.json');
const { QueryTypes } = require('sequelize');

module.exports = {
GetSequelizeVersion: function() {
Expand All @@ -11,29 +10,9 @@ module.exports = {
// in that case we fallback to a branch version
return semver.coerce(version === '0.0.0-development' ? branchVersion : version);
},
GetAdapterVersion: function() {
const pkgVersion = require('../package.json').version;
return semver.coerce(pkgVersion);
},
IsCockroachVersion21_1Plus: async function(connection) {
const versionRow = await connection.query("SELECT version() AS version", { type: QueryTypes.SELECT });
const cockroachDBVersion = versionRow[0]["version"]

return semver.gte(semver.coerce(cockroachDBVersion), "21.1.0")
},
GetCockroachDBVersionFromEnvConfig: function() {
const crdbVersion = process.env['CRDB_VERSION']
return semver.coerce(crdbVersion)
},
GetVersionSeries: function(versionStr) {
// Get the version series from a version string.
// E.g. "6.0.1" is of series "6.0".
const regExp=/(\d+\.\d+)(\.|$)/mg
let match = regExp.exec(versionStr);
if (match === null || match.length < 3) {
return null
}
return match[1]
}
};

1 change: 0 additions & 1 deletion tests/belongs_to_many_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ var Support = {
define: {
paranoid: true
},
dialectOptions: {cockroachdbTelemetryDisabled : true},
});
}
};
Expand Down
1 change: 0 additions & 1 deletion tests/dialects_query_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const Support = {
logging: false,
typeValidation: true,
minifyAliases: options.minifyAliases || false,
dialectOptions: {cockroachdbTelemetryDisabled : true}
});
}
};
Expand Down
1 change: 0 additions & 1 deletion tests/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ function makeTestSequelizeInstance() {
port: process.env.COCKROACH_PORT || 26257,
logging: false,
typeValidation: true,
dialectOptions: {cockroachdbTelemetryDisabled : true},
});
}

Expand Down
1 change: 0 additions & 1 deletion tests/sequelize_query_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const Support = {
benchmark: options.benchmark || false,
logQueryParameters: options.logQueryParameters || false,
minifyAliases: options.minifyAliases || false,
dialectOptions: {cockroachdbTelemetryDisabled : true}
});
}
};
Expand Down
1 change: 0 additions & 1 deletion tests/support.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const Support = {
logging: console.log,
typeValidation: true,
minifyAliases: options.minifyAliases || false,
dialectOptions: {cockroachdbTelemetryDisabled : true},
...options
});
},
Expand Down
Loading