Merge tag 'v7.0.0-alpha.34' into sequelize-core-papandreou2

v7.0.0-alpha.34

* tag 'v7.0.0-alpha.34': (94 commits)
  v7.0.0-alpha.34
  feat!: rename association classes to prevent conflicts with decorators (sequelize#16513)
  meta: add unit test for ARRAY(UUID) (sequelize#16841)
  fix: correct link to data types docs (sequelize#16674)
  feat: add support for `sql` tag & functions in `sequelize.query` (sequelize#16863)
  feat: add an option to control the behavior of `null` in JSON attributes (sequelize#16861)
  meta: update dependency nx to v17.2.1 (sequelize#16862)
  meta: update sequelize AUTHORS (sequelize#16856)
  meta: lock file maintenance (sequelize#16859)
  meta: update dependency typedoc-plugin-mdn-links to v3.1.7 (sequelize#16857)
  meta: update dependency markdownlint-cli to v0.38.0 (sequelize#16854)
  meta: update dependency nx to v17.2.0 (sequelize#16853)
  meta: update dependency ts-node to v10.9.2 (sequelize#16852)
  meta: update dependency @types/snowflake-sdk to v1.6.20 (sequelize#16850)
  meta: update dependency @types/snowflake-sdk to v1.6.19 (sequelize#16849)
  meta: update actions/stale action to v9 (sequelize#16847)
  meta: update dependency snowflake-sdk to v1.9.2 (sequelize#16846)
  meta: update dependency @types/node to v20.10.4 (sequelize#16845)
  meta: add tests to verify that showConstraints filters on schema (sequelize#16785)
  meta: update sequelize AUTHORS (sequelize#16781)
  ...

.github/workflows/auto-add-pending-approval.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             github.rest.issues.addLabels({

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         id: stale-bug
         with:
           stale-issue-label: "stale"
@@ -26,7 +26,7 @@ jobs:
           days-before-pr-close: -1
           only-issue-labels: 'type: bug'
           any-of-issue-labels: 'pending-approval'
-      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         id: stale-feature
         with:
           stale-issue-label: "stale"
@@ -40,7 +40,7 @@ jobs:
           only-issue-labels: 'type: feature'
           any-of-issue-labels: 'pending-approval'
           any-of-pr-labels: 'maybe-abandoned'
-      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         id: invalid
         with:
           stale-issue-label: "stale"

.gitignore

@@ -19,6 +19,7 @@ node_modules
 *.log
 /packages/*/lib
 /packages/*/types
+/.nx
 
 .pnp.*
 .yarn/*

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

AUTHORS

@@ -1274,5 +1274,7 @@ Ben Sykes <me@sykesey.id.au>
 rcronin <rcronin@daytonfreight.com>
 Vinícius Stein Dahmer <30452636+viniciussdahmer@users.noreply.github.com>
 Vatroslav Vrbanic <v.vrbanic@cream.gmbh>
+Guillaume Gautreau <guillaume+github@ghusse.com>
+Guillaume Gautreau <guillaumeg@forestadmin.com>
 
 # Generated by dev/update-authors.js

CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.0.0-alpha.34](https://github.com/sequelize/sequelize/compare/v7.0.0-alpha.33...v7.0.0-alpha.34) (2023-12-12)
+
+
+### Bug Fixes
+
+* correct link to data types docs ([#16674](https://github.com/sequelize/sequelize/issues/16674)) ([48dbd6f](https://github.com/sequelize/sequelize/commit/48dbd6f96388140c39b3063215da582e8ac0e4df))
+* **mssql:** error when calling describeTable a table with a dot in its name ([#16771](https://github.com/sequelize/sequelize/issues/16771)) ([579338e](https://github.com/sequelize/sequelize/commit/579338e0be434e7bddfee84248fa368a5a8b53ad))
+* sort keys by depth in groupJoinData ([#16788](https://github.com/sequelize/sequelize/issues/16788)) ([4959e0d](https://github.com/sequelize/sequelize/commit/4959e0db520128414f4e3960e5178f2208bd13ab))
+
+
+### Features
+
+* add an option to control the behavior of `null` in JSON attributes ([#16861](https://github.com/sequelize/sequelize/issues/16861)) ([aff8f64](https://github.com/sequelize/sequelize/commit/aff8f64c7e987c9614267ebe29dbb07a517911da))
+* add support for `sql` tag & functions in `sequelize.query` ([#16863](https://github.com/sequelize/sequelize/issues/16863)) ([7129200](https://github.com/sequelize/sequelize/commit/7129200091f4e8cfa46fbece381d6a44a40baf79))
+
+
+
+
+
 # [7.0.0-alpha.33](https://github.com/sequelize/sequelize/compare/v7.0.0-alpha.32...v7.0.0-alpha.33) (2023-10-11)
 
 

CONTRIBUTING.md

@@ -113,12 +113,41 @@ Clone the repository (if you haven't already) via `git clone https://github.com/
 
 ### 2. Install the Node.js dependencies
 
-Run `yarn install` within the cloned repository folder.
+Run `yarn install` within the cloned repository folder to install the dependencies.
+
+Once installed, run the `yarn build` command to build the project.
 
 #### 2.1 Adding and updating dependencies
 
 [Yarn v3](https://yarnpkg.com//) is used in the CI/CD pipeline so adding and updating dependencies must be done with Yarn.
 
+#### 2.2 Running commands
+
+Sequelize is a monorepo and uses `lerna` to run scripts in each of the packages. The syntax for the commands is: `yarn lerna run` followed by the script name. For example:
+
+```
+yarn lerna run test-unit
+```
+
+By default, the `yarn lerna run` command will run the script in all packages which have a matching script. By appending `--scope=package_name` to the command (where `package_name` is the name of the package you want to run the script on) you can select a specific package to run the script on. For example:
+
+```
+yarn lerna run test-unit --scope=@sequelize/core
+```
+
+Lerna caching is enabled and the following commands:
+- `yarn build`
+- `yarn test-typings`
+- `yarn test-unit`
+
+Currently the caching is configured to watch the `src` folder and `package.json` and `tsconfig.json` files in each package for production changes and all files in each package for default changes.
+
+This means that running the `yarn build` command and not making changes to the production files (see above), the output of the commands loaded from cache rather than the command executing. When running `yarn test-typings` or `yarn test-unit`, any changes in the package folder will cause command to run rather than the results loaded from cache.
+
+If you run into any issues with the cache, running the command `yarn dlx nx reset` will reset the cache.
+
+For more information about using `lerna` commands, use the [Lerna Documentation](https://lerna.js.org/docs/api-reference/commands).
+
 ### 3. Prepare local databases to run tests
 
 If you're happy to run tests only against an SQLite database, you can skip this section.
@@ -155,20 +184,6 @@ You will have to manually install and configure each of database engines you wan
 
 ### 4. Running tests
 
-Sequelize is a monorepo and uses `lerna` to run scripts in each of the packages. The syntax for the commands is: `yarn lerna run` followed by the script name. For example:
-
-```
-yarn lerna run test-unit
-```
-
-By default, the `yarn lerna run` command will run the script in all packages which have a matching script. By appending `--scope=package_name` to the command (where `package_name` is the name of the package you want to run the script on) you can select a specific package to run the script on. For example:
-
-```
-yarn lerna run test-unit --scope=@sequelize/core
-```
-
-For more information about using `lerna` commands, use the [Lerna Documentation](https://lerna.js.org/docs/api-reference/commands).
-
 Before starting any work, try to run the tests locally in order to be sure your setup is fine. Start by running the SQLite tests:
 
 ```
@@ -185,6 +200,8 @@ Then, if you want to run tests for another dialect, assuming you've set it up as
 
 There are also the `test-unit-*` and `test-integration-*` sets of scripts (for example, `test-integration-postgres`).
 
+_Note:_ when running these test, you will need to run `yarn build` after you have made changes to the source code for these changes to affect the tests. The `yarn lerna run test-{dialect}` command does this for you.
+
 #### 4.1. Running only some tests
 
 While you're developing, you may want to execute only a single test (or a few), instead of executing everything (which takes some time). You can easily achieve this by modifying the `.mocharc.jsonc` file inside the package's root directory (but don't commit those changes!) to use `spec` (and maybe `grep`) from Mocha to specify the desired tests. Then, from your terminal, navigate to the package's root directory and simply call `DIALECT=some-dialect yarn mocha` (example: `DIALECT=postgres yarn mocha`). The package root directory is where the package.json file for the package is located. For example with the @sequelize/core package, the package root directory is [packages/core](https://github.com/sequelize/sequelize/tree/main/packages/core).

dev/db2/latest/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   db2-latest:
     container_name: sequelize-db2-latest
-    image: icr.io/db2_community/db2:11.5.8.0
+    image: icr.io/db2_community/db2:11.5.9.0
     privileged: true
     env_file: ../.env_list
     environment:

dev/mariadb/latest/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   mariadb-latest:
     container_name: sequelize-mariadb-latest
-    image: mariadb:11.1.2
+    image: mariadb:11.2.2
     environment:
       MYSQL_DATABASE: sequelize_test
       MYSQL_USER: sequelize_test

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.0.0-alpha.33"
+  "version": "7.0.0-alpha.34"
 }

package.json

@@ -52,33 +52,33 @@
   ],
   "devDependencies": {
     "@ephys/eslint-config-typescript": "19.0.2",
-    "@rushstack/eslint-patch": "1.5.1",
-    "@types/node": "20.8.10",
+    "@rushstack/eslint-patch": "1.6.0",
+    "@types/node": "20.10.4",
     "chai": "4.3.10",
     "concurrently": "8.2.2",
     "cross-env": "7.0.3",
     "esbuild": "0.17.19",
-    "eslint": "8.53.0",
-    "eslint-plugin-jsdoc": "46.8.2",
+    "eslint": "8.55.0",
+    "eslint-plugin-jsdoc": "46.9.0",
     "eslint-plugin-mocha": "10.2.0",
-    "fast-glob": "3.3.1",
+    "fast-glob": "3.3.2",
     "husky": "8.0.3",
-    "lerna": "7.4.2",
-    "lint-staged": "15.0.2",
-    "markdownlint-cli": "0.37.0",
+    "lerna": "8.0.0",
+    "lint-staged": "15.2.0",
+    "markdownlint-cli": "0.38.0",
     "mocha": "10.2.0",
     "node-gyp": "10.0.1",
     "node-hook": "1.0.0",
-    "nx": "16.10.0",
+    "nx": "17.2.1",
     "source-map-support": "0.5.21",
-    "ts-node": "10.9.1",
-    "typedoc": "0.25.2",
-    "typedoc-plugin-carbon-ads": "1.5.0",
-    "typedoc-plugin-mdn-links": "3.1.0",
+    "ts-node": "10.9.2",
+    "typedoc": "0.25.4",
+    "typedoc-plugin-carbon-ads": "1.6.0",
+    "typedoc-plugin-mdn-links": "3.1.7",
     "typedoc-plugin-missing-exports": "2.1.0",
     "typescript": "5.2.2"
   },
-  "packageManager": "yarn@4.0.1",
+  "packageManager": "yarn@4.0.2",
   "lint-staged": {
     "*.{js,mjs,cjs,ts,mts,cts}": "eslint --fix --report-unused-disable-directives"
   }

packages/core/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.0.0-alpha.34](https://github.com/sequelize/sequelize/compare/v7.0.0-alpha.33...v7.0.0-alpha.34) (2023-12-12)
+
+
+### Bug Fixes
+
+* correct link to data types docs ([#16674](https://github.com/sequelize/sequelize/issues/16674)) ([48dbd6f](https://github.com/sequelize/sequelize/commit/48dbd6f96388140c39b3063215da582e8ac0e4df))
+* **mssql:** error when calling describeTable a table with a dot in its name ([#16771](https://github.com/sequelize/sequelize/issues/16771)) ([579338e](https://github.com/sequelize/sequelize/commit/579338e0be434e7bddfee84248fa368a5a8b53ad))
+* sort keys by depth in groupJoinData ([#16788](https://github.com/sequelize/sequelize/issues/16788)) ([4959e0d](https://github.com/sequelize/sequelize/commit/4959e0db520128414f4e3960e5178f2208bd13ab))
+
+
+### Features
+
+* add an option to control the behavior of `null` in JSON attributes ([#16861](https://github.com/sequelize/sequelize/issues/16861)) ([aff8f64](https://github.com/sequelize/sequelize/commit/aff8f64c7e987c9614267ebe29dbb07a517911da))
+* add support for `sql` tag & functions in `sequelize.query` ([#16863](https://github.com/sequelize/sequelize/issues/16863)) ([7129200](https://github.com/sequelize/sequelize/commit/7129200091f4e8cfa46fbece381d6a44a40baf79))
+
+
+
+
+
 # [7.0.0-alpha.33](https://github.com/sequelize/sequelize/compare/v7.0.0-alpha.32...v7.0.0-alpha.33) (2023-10-11)
 
 

packages/core/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "sequelize-core-papandreou",
+  "name": "@sequelize/core",
   "description": "Sequelize is a promise-based Node.js ORM tool for Postgres, MySQL, MariaDB, SQLite, Microsoft SQL Server, Amazon Redshift, Snowflake’s Data Cloud, Db2, and IBM i. It features solid transaction support, relations, eager and lazy loading, read replication and more.",
-  "version": "7.0.0-alpha.33-patch7",
+  "version": "7.0.0-alpha.34",
   "funding": [
     {
       "type": "opencollective",
@@ -67,31 +67,31 @@
     "wkx": "^0.5.0"
   },
   "devDependencies": {
-    "@types/chai": "4.3.9",
-    "@types/chai-as-promised": "7.1.7",
-    "@types/chai-datetime": "0.0.38",
-    "@types/ibm_db": "2.0.15",
-    "@types/lodash": "4.14.200",
-    "@types/mocha": "10.0.3",
-    "@types/pg": "8.10.7",
-    "@types/semver": "7.5.4",
-    "@types/sinon": "10.0.20",
-    "@types/sinon-chai": "3.2.11",
-    "@types/snowflake-sdk": "1.6.16",
-    "@types/tedious": "4.0.13",
-    "@types/uuid": "9.0.6",
+    "@types/chai": "4.3.11",
+    "@types/chai-as-promised": "7.1.8",
+    "@types/chai-datetime": "0.0.39",
+    "@types/ibm_db": "2.0.16",
+    "@types/lodash": "4.14.202",
+    "@types/mocha": "10.0.6",
+    "@types/pg": "8.10.9",
+    "@types/semver": "7.5.6",
+    "@types/sinon": "17.0.2",
+    "@types/sinon-chai": "3.2.12",
+    "@types/snowflake-sdk": "1.6.20",
+    "@types/tedious": "4.0.14",
+    "@types/uuid": "9.0.7",
     "chai": "4.3.10",
     "chai-as-promised": "7.1.1",
     "chai-datetime": "1.8.0",
     "delay": "5.0.0",
     "expect-type": "0.13.0",
     "fs-jetpack": "5.1.0",
-    "ibm_db": "3.2.2",
-    "lcov-result-merger": "4.1.0",
+    "ibm_db": "3.2.3",
+    "lcov-result-merger": "5.0.0",
     "mariadb": "3.2.2",
     "mocha": "10.2.0",
     "moment": "2.29.4",
-    "mysql2": "3.6.3",
+    "mysql2": "3.6.5",
     "nyc": "15.1.0",
     "odbc": "2.4.8",
     "p-map": "4.0.0",
@@ -102,9 +102,9 @@
     "rimraf": "5.0.5",
     "sinon": "17.0.1",
     "sinon-chai": "3.7.0",
-    "snowflake-sdk": "1.9.0",
+    "snowflake-sdk": "1.9.2",
     "sqlite3": "5.1.6",
-    "tedious": "16.6.0"
+    "tedious": "16.6.1"
   },
   "peerDependenciesMeta": {
     "ibm_db": {