update v7-alpha.32

Author: demopark

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help improve（翻译问题反馈）
+about: Create a report to help improve(翻译问题反馈)
 title: ''
 labels: 'bug'
 assignees: ''

CHANGELOG.md

@@ -1,5 +1,8 @@
 # 更新记录
 
+## 2023-06-19
+* master 分支同步到 7.0.0-alpha.23
+
 ## 2022-02-10
 * master 分支同步翻译到 v7 文档 7.1.0
 * v6 文档启用单独分支
@@ -72,7 +75,9 @@
 ### 更新
 * 同步官方最新文档版本 4.13.8
 * 翻译 getting-started.md
-* 翻译 models-definition.md* 翻译 models-usage.md* 翻译 querying.md
+* 翻译 models-definition.md
+* 翻译 models-usage.md
+* 翻译 querying.md
 
 ## 2017-07-14
 

Readme.md

@@ -2,29 +2,26 @@
 
 ![](http://docs.sequelizejs.com/manual/asset/logo-small.png)
 
-[![npm version](https://badgen.net/npm/v/sequelize)](https://www.npmjs.com/package/sequelize)
-[![Build Status](https://github.com/sequelize/sequelize/workflows/CI/badge.svg)](https://github.com/sequelize/sequelize/actions?query=workflow%3ACI)
-[![npm downloads](https://badgen.net/npm/dm/sequelize)](https://www.npmjs.com/package/sequelize)
+[![npm version](https://badgen.net/npm/v/@sequelize/core)](https://www.npmjs.com/package/@sequelize/core)
+[![npm downloads](https://badgen.net/npm/dm/@sequelize/core)](https://www.npmjs.com/package/@sequelize/core)
+[![contributors](https://img.shields.io/github/contributors/sequelize/sequelize)](https://github.com/sequelize/sequelize/graphs/contributors)
+[![Open Collective](https://img.shields.io/opencollective/backers/sequelize)](https://opencollective.com/sequelize#section-contributors)
 [![sponsor](https://img.shields.io/opencollective/all/sequelize?label=sponsors)](https://opencollective.com/sequelize)
-[![Last commit](https://badgen.net/github/last-commit/sequelize/sequelize)](https://github.com/sequelize/sequelize)
 [![Merged PRs](https://badgen.net/github/merged-prs/sequelize/sequelize)](https://github.com/sequelize/sequelize)
-[![GitHub stars](https://badgen.net/github/stars/sequelize/sequelize)](https://github.com/sequelize/sequelize)
-[![Slack Status](http://sequelize-slack.herokuapp.com/badge.svg)](http://sequelize-slack.herokuapp.com/)
-[![node](https://badgen.net/npm/node/sequelize)](https://www.npmjs.com/package/sequelize)
-[![License](https://badgen.net/github/license/sequelize/sequelize)](https://github.com/sequelize/sequelize/blob/main/LICENSE)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-> 此项目同步自 [sequelize](https://github.com/sequelize) / [sequelize](https://github.com/sequelize/sequelize) 项目中的  docs.
+> 此项目同步自 [sequelize](https://github.com/sequelize) / [sequelize](https://github.com/sequelize/sequelize) 项目.
 > 
 > 更新日志请参阅: [CHANGELOG](CHANGELOG.md)
 
-Sequelize 是一个基于 promise 的 [Node.js](https://nodejs.org/zh-cn/about/) [ORM 工具](https://en.wikipedia.org/wiki/Object-relational_mapping), 目前支持 [Postgres](https://en.wikipedia.org/wiki/PostgreSQL), [MySQL](https://en.wikipedia.org/wiki/MySQL), [MariaDB](https://en.wikipedia.org/wiki/MariaDB), [SQLite](https://en.wikipedia.org/wiki/SQLite) 以及 [Microsoft SQL Server](https://en.wikipedia.org/wiki/Microsoft_SQL_Server), [Amazon Redshift](https://docs.aws.amazon.com/redshift/index.html) 和 [Snowflake’s Data Cloud](https://docs.snowflake.com/en/user-guide/intro-key-concepts.html). 它具有强大的事务支持, 关联关系, 预读和延迟加载,读取复制等功能.
+Sequelize 是一个易用且基于 promise 的 [Node.js](https://nodejs.org/en/about/) [ORM 工具](https://en.wikipedia.org/wiki/Object-relational_mapping) 适用于 [Postgres](https://en.wikipedia.org/wiki/PostgreSQL), [MySQL](https://en.wikipedia.org/wiki/MySQL), [MariaDB](https://en.wikipedia.org/wiki/MariaDB), [SQLite](https://en.wikipedia.org/wiki/SQLite), [DB2](https://en.wikipedia.org/wiki/IBM_Db2_Family), [Microsoft SQL Server](https://en.wikipedia.org/wiki/Microsoft_SQL_Server), [Snowflake](https://www.snowflake.com/), [Oracle DB](https://www.oracle.com/database/) 和 [Db2 for IBM i](https://www.ibm.com/support/pages/db2-ibm-i). 它具有强大的事务支持, 关联关系, 预读和延迟加载,读取复制等功能.
 
-Sequelize 遵从 [语义版本控制](http://semver.org) 和 [官方 Node.js LTS 版本](https://nodejs.org/en/about/releases/). Sequelize v7 版本正式支持 Node.js `^12.22.0`, `^14.17,0`, `^16.0.0`. 其他版本或可正常工作.
+Sequelize 遵从 [语义版本控制](http://semver.org) 和 [官方 Node.js LTS 版本](https://nodejs.org/en/about/releases/). Sequelize v7 版本正式支持 Node.js `^14.17,0`, `^16.0.0`. 其他版本或可正常工作.
+
+你目前正在查看 Sequelize 的**教程和指南**.你可能还对[API 参考](https://sequelize.org/api/v7/) (英文)感兴趣.
 
-你目前正在查看 Sequelize 的**教程和指南**.你可能还对[API 参考](http://docs.sequelizejs.com/identifiers) (英文)感兴趣.
 
-# 赞赏支持
 ![赞赏支持](https://raw.githubusercontent.com/demopark/electron-api-demos-Zh_CN/master/assets/img/td.png)
 
 
@@ -45,7 +42,9 @@ Sequelize 遵从 [语义版本控制](http://semver.org) 和 [官方 Node.js LTS
 - [从 v5 升级到 v6](other-topics/upgrade-to-v6.md)
 - [从 v6 升级到 v7](other-topics/upgrade-to-v7.md)
 
-## 文档(v7)
+## 文档(v7-alpha)
+
+**注意** 由于当前alpha阶段api调整, 文档中的API参考指向尚未确定. 可前往 [V7 API 参考](https://sequelize.org/api/v7/)自行查询.
 
 ### 核心概念
 
@@ -93,7 +92,7 @@ Sequelize 遵从 [语义版本控制](http://semver.org) 和 [官方 Node.js LTS
 
 ```sh
 # 使用 npm
-npm i sequelize # 这将安装最新版本的 Sequelize
+npm install sequelize # 这将安装最新版本的 Sequelize
 # 使用 yarn
 yarn add sequelize
 ```
@@ -107,18 +106,50 @@ npm i mariadb # MariaDB
 npm i sqlite3 # SQLite
 npm i tedious # Microsoft SQL Server
 npm i ibm_db # DB2
+npm i odbc # IBM i
+
 # 使用 yarn
 yarn add pg pg-hstore # PostgreSQL
 yarn add mysql2 # MySQL
 yarn add mariadb # MariaDB
 yarn add sqlite3 # SQLite
 yarn add tedious # Microsoft SQL Server
 yarn add ibm_db # DB2
+yarn add odbc # IBM i
 ```
 
 ## 简单示例
 
-```js
+#### TypeScript
+
+```javascript
+import { Sequelize, Model, DataTypes, InferAttributes, InferCreationAttributes } from 'sequelize';
+
+const sequelize = new Sequelize('sqlite::memory:');
+
+class User extends Model<InferAttributes<User>, InferCreationAttributes<User>> {
+  declare username: string | null;
+  declare birthday: Date | null;
+}
+
+User.init({
+  username: DataTypes.STRING,
+  birthday: DataTypes.DATE
+}, { sequelize, modelName: 'user' });
+
+(async () => {
+  await sequelize.sync();
+  const jane = await User.create({
+    username: 'janedoe',
+    birthday: new Date(1980, 6, 20),
+  });
+  console.log(jane.toJSON());
+})();
+```
+
+#### JavaScript (CJS)
+
+```javascript
 const { Sequelize, Model, DataTypes } = require('sequelize');
 const sequelize = new Sequelize('sqlite::memory:');
 

advanced-association-concepts/advanced-many-to-many.md

@@ -481,7 +481,7 @@ someUser.getProfiles({ joinTableAttributes: ['selfGranted'] });
 ```js
 const Player = sequelize.define('Player', { username: DataTypes.STRING });
 const Team = sequelize.define('Team', { name: DataTypes.STRING });
-const Game = sequelize.define('Game', { name: DataTypes.INTEGER });
+const Game = sequelize.define('Game', { name: DataTypes.STRING });
 ```
 
 现在的问题是：如何关联它们？
@@ -537,13 +537,13 @@ GameTeam.hasMany(PlayerGameTeam);
 上面的关联正是我们想要的. 这是一个完整的可运行示例：
 
 ```js
-const { Sequelize, Op, Model, DataTypes } = require('sequelize');
+const { Sequelize, Op, Model, DataTypes } = require('@sequelize/core');
 const sequelize = new Sequelize('sqlite::memory:', {
   define: { timestamps: false } // 在这个例子中只是为了减少混乱
 });
 const Player = sequelize.define('Player', { username: DataTypes.STRING });
 const Team = sequelize.define('Team', { name: DataTypes.STRING });
-const Game = sequelize.define('Game', { name: DataTypes.INTEGER });
+const Game = sequelize.define('Game', { name: DataTypes.STRING });
 
 // 我们在 Game 和 Team 游戏和团队之间应用超级多对多关系
 const GameTeam = sequelize.define('GameTeam', {

advanced-association-concepts/creating-with-associations.md

@@ -9,23 +9,23 @@
 考虑以下模型:
 
 ```js
-class Product extends Model {}
-Product.init({
-  title: Sequelize.STRING
-}, { sequelize, modelName: 'product' });
-class User extends Model {}
-User.init({
-  firstName: Sequelize.STRING,
-  lastName: Sequelize.STRING
-}, { sequelize, modelName: 'user' });
-class Address extends Model {}
-Address.init({
-  type: DataTypes.STRING,
-  line1: Sequelize.STRING,
-  line2: Sequelize.STRING,
-  city: Sequelize.STRING,
-  state: Sequelize.STRING,
-  zip: Sequelize.STRING,
+class Product extends Model {}
+Product.init({
+  title: DataTypes.STRING
+}, { sequelize, modelName: 'product' });
+class User extends Model {}
+User.init({
+  firstName: DataTypes.STRING,
+  lastName: DataTypes.STRING
+}, { sequelize, modelName: 'user' });
+class Address extends Model {}
+Address.init({
+  type: DataTypes.STRING,
+  line1: DataTypes.STRING,
+  line2: DataTypes.STRING,
+  city: DataTypes.STRING,
+  state: DataTypes.STRING,
+  zip: DataTypes.STRING,
 }, { sequelize, modelName: 'address' });
 
 // 我们保存关联设置调用的返回值,以便以后使用
@@ -87,7 +87,7 @@ return Product.create({
 ```js
 class Tag extends Model {}
 Tag.init({
-  name: Sequelize.STRING
+  name: DataTypes.STRING
 }, { sequelize, modelName: 'tag' });
 
 Product.hasMany(Tag);

advanced-association-concepts/eager-loading.md

@@ -133,7 +133,7 @@ User.findAll({
 User.findAll({
   include: {
     model: Tool,
-    as: 'Instruments'
+    as: 'Instruments',
     where: {
       size: {
         [Op.ne]: 'small'

advanced-association-concepts/polymorphic-associations.md

@@ -106,7 +106,7 @@ Video.hasMany(Comment, {
 });
 Comment.belongsTo(Video, { foreignKey: 'commentableId', constraints: false });
 
-Comment.addHook("afterFind", findResult => {
+Comment.hooks.addListener("afterFind", findResult => {
   if (!Array.isArray(findResult)) findResult = [findResult];
   for (const instance of findResult) {
     if (instance.commentableType === "image" && instance.image !== undefined) {

core-concepts/assocs.md

@@ -159,7 +159,7 @@ Bar.belongsTo(Foo, {
 例如,要使用 `UUID` 作为外键数据类型而不是默认值(`INTEGER`),只需执行以下操作：
 
 ```js
-const { DataTypes } = require("Sequelize");
+const { DataTypes } = require('@sequelize/core');
 
 Foo.hasOne(Bar, {
   foreignKey: {
@@ -309,7 +309,7 @@ CREATE TABLE IF NOT EXISTS "ActorMovies" (
 
 与一对一和一对多关系不同,对于多对多关系,`ON UPDATE` 和 `ON DELETE` 的默认值为 `CASCADE`.
 
-当模型中不存在主键时，Belongs-to-Many 将创建一个唯一键. 可以使用 **uniqueKey**  参数覆盖此唯一键名. 若不希望产生唯一键, 可以使用 ***unique: false*** 参数.
+当模型中不存在主键时, Belongs-to-Many 将创建一个唯一键. 可以使用 **uniqueKey**  参数覆盖此唯一键名. 若不希望产生唯一键, 可以使用 ***unique: false*** 参数.
 
 ```js
 Project.belongsToMany(User, { through: UserProjects, uniqueKey: 'my_custom_unique' })
@@ -401,9 +401,9 @@ console.log('Amount of Sails:', awesomeCaptain.ship.amountOfSails);
   // 这里没有什么特别的东西
   ```
 
-* 或使用关联模型可用的 *[特殊方法/混合](＃special-methods-mixins-to-instances)* ,这将在本文稍后进行解释.
+* 或使用关联模型可用的 *[特殊方法/混合]* ,这将在本文稍后进行解释.
 
-**注意:** [`save()`实例方法](https://sequelize.org/master/class/lib/model.js~Model.html#instance-method-save) 并不知道关联关系. 如果你修改了 *父级* 对象预先加载的 *子级* 的值,那么在父级上调用 `save()` 将会忽略子级上发生的修改.
+**注意:** [`save()` 实例方法](/api/v7/classes/Model.html#save) 并不知道关联关系. 如果你修改了 *父级* 对象预先加载的 *子级* 的值,那么在父级上调用 `save()` 将会忽略子级上发生的修改.
 
 ## 关联别名 & 自定义外键
 

core-concepts/getters-setters-virtuals.md

@@ -2,7 +2,7 @@
 
 Sequelize 允许你为模型的属性定义自定义获取器和设置器.
 
-Sequelize 还允许你指定所谓的 *虚拟属性*,它们是 Sequelize 模型上的属性,这些属性在基础 SQL 表中实际上并不存在,而是由 Sequelize 自动填充. 它们对于创建自定义属性非常有用, 这也可以简化您的代码.
+Sequelize 还允许你指定所谓的 *虚拟属性*,它们是 Sequelize 模型上的属性,这些属性在基础 SQL 表中实际上并不存在,而是由 Sequelize 自动填充. 它们对于创建自定义属性非常有用, 这也可以简化你的代码.
 
 ## 获取器
 
@@ -132,7 +132,7 @@ console.log(post.getDataValue('content'));
 如果有一种简单的方法能直接获取 *全名* 那会非常好！ 我们可以将 `getters` 的概念与 Sequelize 针对这种情况提供的特殊数据类型结合使用：`DataTypes.VIRTUAL`:
 
 ```js
-const { DataTypes } = require("sequelize");
+const { DataTypes } = require('@sequelize/core');
 
 const User = sequelize.define('user', {
   firstName: DataTypes.TEXT,
@@ -155,47 +155,3 @@ const User = sequelize.define('user', {
 const user = await User.create({ firstName: 'John', lastName: 'Doe' });
 console.log(user.fullName); // 'John Doe'
 ```
-
-## 在 Sequelize v7 中已弃用：`getterMethods` 和 `setterMethods`
-
-Sequelize 在模型定义中还提供了 `getterMethods` 和 `setterMethods` 参数,以指定看起来像但与虚拟属性不完全相同的事物. 不鼓励使用此方法,并且将来可能会**不建议**使用(建议直接使用虚拟属性).
-
-示例:
-
-```js
-const { Sequelize, DataTypes } = require('sequelize');
-const sequelize = new Sequelize('sqlite::memory:');
-
-const User = sequelize.define('user', {
-  firstName: DataTypes.STRING,
-  lastName: DataTypes.STRING
-}, {
-  getterMethods: {
-    fullName() {
-      return this.firstName + ' ' + this.lastName;
-    }
-  },
-  setterMethods: {
-    fullName(value) {
-      // 注意：这仅用于演示.
-      // 查阅: https://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/
-      const names = value.split(' ');
-      const firstName = names[0];
-      const lastName = names.slice(1).join(' ');
-      this.setDataValue('firstName', firstName);
-      this.setDataValue('lastName', lastName);
-    }
-  }
-});
-
-(async () => {
-  await sequelize.sync();
-  let user = await User.create({ firstName: 'John',  lastName: 'Doe' });
-  console.log(user.fullName); // 'John Doe'
-  user.fullName = 'Someone Else';
-  await user.save();
-  user = await User.findOne();
-  console.log(user.firstName); // 'Someone'
-  console.log(user.lastName); // 'Else'
-})();
-```