Skip to content

Commit aeafe37

Browse files
committed
test: Upgrade the Sequelize driver and example.
1 parent a9185b8 commit aeafe37

File tree

9 files changed

+41
-44
lines changed

9 files changed

+41
-44
lines changed

examples/sequelize/mysql2/connect.cjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ async function connect({ instanceConnectionName, username, databaseName }) {
2525

2626
const database = new Sequelize({
2727
dialect: 'mysql',
28-
username,
28+
user:username,
29+
port:3307,
2930
database: databaseName,
30-
dialectOptions: {
31-
...clientOpts,
32-
},
31+
...clientOpts,
3332
});
3433

3534
await database.authenticate();

examples/sequelize/mysql2/connect.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ export async function connect({ instanceConnectionName, username, databaseName }
2525

2626
const database = new Sequelize({
2727
dialect: 'mysql',
28-
username,
28+
user: username,
29+
port:3307,
2930
database: databaseName,
30-
dialectOptions: {
31-
...clientOpts,
32-
},
31+
...clientOpts,
3332
});
3433

3534
await database.authenticate();

examples/sequelize/mysql2/connect.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ export async function connect({
3333

3434
const database = new Sequelize({
3535
dialect: 'mysql',
36-
username,
36+
user: username,
37+
port:3307,
3738
database: databaseName,
38-
dialectOptions: {
39-
...clientOpts,
40-
},
39+
...clientOpts,
4140
});
4241

4342
await database.authenticate();

examples/sequelize/pg/connect.cjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ async function connect({ instanceConnectionName, username, databaseName }) {
2525

2626
const database = new Sequelize({
2727
dialect: 'postgres',
28-
username,
28+
user: username,
2929
database: databaseName,
30-
dialectOptions: {
31-
...clientOpts,
32-
},
30+
...clientOpts,
3331
});
3432

3533
await database.authenticate();

examples/sequelize/pg/connect.mjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ export async function connect({ instanceConnectionName, username, databaseName }
2525

2626
const database = new Sequelize({
2727
dialect: 'postgres',
28-
username,
28+
user: username,
2929
database: databaseName,
30-
dialectOptions: {
31-
...clientOpts,
32-
},
30+
...clientOpts,
3331
});
3432

3533
await database.authenticate();

examples/sequelize/pg/connect.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ export async function connect({
3333

3434
const database = new Sequelize({
3535
dialect: 'postgres',
36-
username,
36+
user: username,
3737
database: databaseName,
38-
dialectOptions: {
39-
...clientOpts,
40-
},
38+
...clientOpts,
4139
});
4240

4341
await database.authenticate();

examples/sequelize/tedious/connect.cjs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
const {Connector} = require('@google-cloud/cloud-sql-connector');
1615
const {Sequelize} = require('@sequelize/core');
16+
const {Connector} = require('@google-cloud/cloud-sql-connector');
1717

18-
async function connect({ instanceConnectionName, username, password, databaseName }) {
18+
async function connect({instanceConnectionName, username, password, databaseName}) {
1919
const connector = new Connector();
2020
const clientOpts = await connector.getTediousOptions({
2121
instanceConnectionName,
@@ -25,14 +25,16 @@ async function connect({ instanceConnectionName, username, password, databaseNam
2525

2626
const database = new Sequelize({
2727
dialect: 'mssql',
28-
username,
29-
password,
28+
server: 'localhost',
3029
database: databaseName,
31-
dialectOptions: {
30+
authentication: {
31+
type: "default",
3232
options: {
33-
...clientOpts,
34-
},
33+
userName: username,
34+
password: password,
35+
}
3536
},
37+
...clientOpts,
3638
});
3739

3840
await database.authenticate();
@@ -42,9 +44,9 @@ async function connect({ instanceConnectionName, username, password, databaseNam
4244
async close() {
4345
await database.close();
4446
connector.close();
45-
}
47+
},
4648
};
47-
};
49+
}
4850

4951
module.exports = {
5052
connect,

examples/sequelize/tedious/connect.mjs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ export async function connect({ instanceConnectionName, username, password, data
2525

2626
const database = new Sequelize({
2727
dialect: 'mssql',
28-
username,
29-
password,
28+
server: 'localhost',
3029
database: databaseName,
31-
dialectOptions: {
30+
authentication: {
31+
type: "default",
3232
options: {
33-
...clientOpts,
34-
},
33+
userName: username,
34+
password: password,
35+
}
3536
},
37+
...clientOpts,
3638
});
3739

3840
await database.authenticate();

examples/sequelize/tedious/connect.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,18 @@ export async function connect({
3434

3535
const database = new Sequelize({
3636
dialect: 'mssql',
37-
username,
38-
password,
37+
server: 'localhost',
3938
database: databaseName,
40-
dialectOptions: {
39+
authentication: {
40+
type: "default",
4141
options: {
42-
...clientOpts,
43-
},
42+
userName: username,
43+
password: password,
44+
}
4445
},
46+
...clientOpts,
4547
});
46-
48+
4749
await database.authenticate();
4850

4951
return {

0 commit comments

Comments
 (0)