Skip to content

Commit

Permalink
fix: reduce internal usages of deprecated APIs (#17112)
Browse files Browse the repository at this point in the history
  • Loading branch information
@WikiRik
WikiRik committed Feb 25, 2024
1 parent 4997d70 commit f1db523
Show file tree
Hide file tree
Showing 54 changed files with 327 additions and 257 deletions.
2 changes: 1 addition & 1 deletion dev/postgres/oldest/start.sh
View file
Expand Up @@ -10,4 +10,4 @@ docker compose -p sequelize-postgres-oldest up -d
DIALECT=postgres ts-node ../../check-connection.ts

docker exec sequelize-postgres-oldest \
bash -c "export PGPASSWORD=sequelize_test && psql -h localhost -p 5432 -U sequelize_test sequelize_test -c 'CREATE EXTENSION IF NOT EXISTS btree_gist; CREATE EXTENSION IF NOT EXISTS hstore; CREATE EXTENSION IF NOT EXISTS citext;'"
bash -c "export PGPASSWORD=sequelize_test && psql -h localhost -p 5432 -U sequelize_test sequelize_test -c 'CREATE EXTENSION IF NOT EXISTS btree_gist; CREATE EXTENSION IF NOT EXISTS hstore; CREATE EXTENSION IF NOT EXISTS citext; CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\"'"
4 changes: 2 additions & 2 deletions packages/core/src/model.js
View file
Expand Up @@ -1040,7 +1040,7 @@ ${associationOwner._getAssociationDebugList()}`);
);
}

const schemaOptions = typeof schema === 'string' ? { schema } : schema;
const schemaOptions = typeof schema === 'string' || schema === null ? { schema } : schema;

schemaOptions.schema ||=
this.sequelize.options.schema || this.sequelize.dialect.getDefaultSchema();
Expand Down Expand Up @@ -1128,7 +1128,7 @@ ${associationOwner._getAssociationDebugList()}`);
*
* @example To invoke scope functions you can do
* ```ts
* Model.scope({ method: ['complexFunction', 'dan@sequelize.com', 42]}).findAll()
* Model.withScope({ method: ['complexFunction', 'dan@sequelize.com', 42]}).findAll()
* // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
* ```
*
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/sql-string.ts
View file
Expand Up @@ -28,7 +28,7 @@ export function bestGuessDataTypeOfVal(
return new DataTypes.INTEGER().toDialectDataType(dialect);
}

return new DataTypes.REAL().toDialectDataType(dialect);
return new DataTypes.FLOAT().toDialectDataType(dialect);
}

case 'boolean':
Expand Down
78 changes: 39 additions & 39 deletions packages/core/test/integration/associations/belongs-to-many.test.js
View file
Expand Up @@ -4,7 +4,7 @@ const chai = require('chai');

const expect = chai.expect;
const Support = require('../support');
const { DataTypes, IsolationLevel, Op, Sequelize } = require('@sequelize/core');
const { DataTypes, IsolationLevel, Op, Sequelize, sql } = require('@sequelize/core');
const assert = require('node:assert');
const sinon = require('sinon');

Expand Down Expand Up @@ -178,19 +178,19 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
.define('User', {
username: DataTypes.STRING,
})
.schema('acme', '_');
.withSchema({ schema: 'acme', schemaDelimiter: '_' });
const AcmeProject = this.sequelize
.define('Project', {
title: DataTypes.STRING,
active: DataTypes.BOOLEAN,
})
.schema('acme', '_');
.withSchema({ schema: 'acme', schemaDelimiter: '_' });
const AcmeProjectUsers = this.sequelize
.define('ProjectUsers', {
status: DataTypes.STRING,
data: DataTypes.INTEGER,
})
.schema('acme', '_');
.withSchema({ schema: 'acme', schemaDelimiter: '_' });

AcmeUser.belongsToMany(AcmeProject, {
through: AcmeProjectUsers,
Expand Down Expand Up @@ -231,7 +231,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
id_user: {
type: DataTypes.UUID,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
allowNull: false,
},
},
Expand All @@ -247,7 +247,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
},
},
{
Expand Down Expand Up @@ -290,7 +290,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
},
Expand All @@ -306,7 +306,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
},
Expand Down Expand Up @@ -371,13 +371,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -399,13 +399,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -537,13 +537,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -565,7 +565,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
},
Expand Down Expand Up @@ -681,13 +681,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -709,13 +709,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -855,13 +855,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -883,13 +883,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -1043,12 +1043,12 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -1070,12 +1070,12 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -1135,13 +1135,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -1163,13 +1163,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -1290,13 +1290,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
userSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_second_id',
},
},
Expand All @@ -1318,13 +1318,13 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
groupSecondId: {
type: DataTypes.UUID,
allowNull: false,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_second_id',
},
},
Expand Down Expand Up @@ -1474,7 +1474,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'user_id',
},
},
Expand All @@ -1490,7 +1490,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'company_id',
},
},
Expand All @@ -1506,7 +1506,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
type: DataTypes.UUID,
allowNull: false,
primaryKey: true,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
field: 'group_id',
},
},
Expand Down Expand Up @@ -2633,7 +2633,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), () => {
id: {
primaryKey: true,
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
defaultValue: sql.uuidV4,
},
name: {
type: DataTypes.STRING,
Expand Down
8 changes: 4 additions & 4 deletions packages/core/test/integration/associations/belongs-to.test.js
View file
Expand Up @@ -128,10 +128,10 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => {
it('supports schemas', async function () {
const User = this.sequelize
.define('UserXYZ', { username: DataTypes.STRING, gender: DataTypes.STRING })
.schema('archive');
.withSchema('archive');
const Task = this.sequelize
.define('TaskXYZ', { title: DataTypes.STRING, status: DataTypes.STRING })
.schema('archive');
.withSchema('archive');

Task.belongsTo(User);

Expand Down Expand Up @@ -163,15 +163,15 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => {
allowNull: false,
},
})
.schema('archive');
.withSchema('archive');
const Task = this.sequelize
.define('TaskXYZ', {
user_id: {
type: DataTypes.INTEGER,
references: { model: User, key: 'uid' },
},
})
.schema('archive');
.withSchema('archive');

Task.belongsTo(User, { foreignKey: 'user_id' });

Expand Down

0 comments on commit f1db523

Please sign in to comment.