Skip to content

Commit e5c47a7

Browse files
committed
Simplify sequelize connection setup
Sequelize 6.11.0 includes a change that allows us to just use the connection string rather than having to parse certs and configure the database name.
1 parent e020d76 commit e5c47a7

File tree

3 files changed

+961
-74
lines changed

3 files changed

+961
-74
lines changed

node/sequelize/models/index.js

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,14 @@
11
'use strict';
22

3-
var fs = require('fs');
43
var Sequelize = require('sequelize-cockroachdb');
54

65
if (process.env.ADDR === undefined) {
76
throw new Error("ADDR (database URL) must be specified.");
87
}
98

10-
var url = new URL(process.env.ADDR);
11-
var opts = {
12-
dialect: "postgres",
13-
username: url.username,
14-
host: url.hostname,
15-
port: url.port,
16-
database: url.pathname.substring(1), // ignore leading '/'
17-
dialectOptions: {
18-
cockroachdbTelemetryDisabled: true,
19-
ssl: {},
20-
},
21-
logging: false,
22-
};
23-
24-
if (url.password) {
25-
opts.password = url.password
26-
}
27-
if (url.searchParams.has("options")) {
28-
var pgOpts = url.searchParams.get("options")
29-
var cluster = pgOpts.match(/cluster=([^\s]+)/)[1]
30-
opts.database = `${cluster}.${opts.database}`
31-
}
32-
if (url.searchParams.get("sslmode") === "disable") {
33-
delete opts.dialectOptions.ssl
34-
} else {
35-
if (url.searchParams.has("sslrootcert")) {
36-
opts.dialectOptions.ssl.ca = fs.readFileSync(url.searchParams.get("sslrootcert").toString())
37-
}
38-
if (url.searchParams.has("sslcert")) {
39-
opts.dialectOptions.ssl.cert = fs.readFileSync(url.searchParams.get("sslcert").toString())
40-
}
41-
if (url.searchParams.has("sslkey")) {
42-
opts.dialectOptions.ssl.key = fs.readFileSync(url.searchParams.get("sslkey").toString())
43-
}
44-
}
45-
var sequelize = new Sequelize(opts);
9+
var sequelize = new Sequelize(process.env.ADDR, {
10+
dialectOptions: {cockroachdbTelemetryDisabled : true}
11+
});
4612
var DataTypes = Sequelize.DataTypes;
4713

4814
if (!Sequelize.supportsCockroachDB) {

0 commit comments

Comments
 (0)