Merge remote-tracking branch 'origin/main' into v6

sequelize · Nov 3, 2023 · 14c0b76 · 14c0b76
2 parents dc0317c + a52f8bd
commit 14c0b76
Show file tree

Hide file tree

Showing 5 changed files with 1,286 additions and 1,418 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
       DIALECT: postgres
       SEQ_PORT: 54320
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -41,8 +41,8 @@ jobs:
       DIALECT: mysql
       SEQ_PORT: 33060
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -61,8 +61,8 @@ jobs:
     env:
       DIALECT: sqlite
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -82,8 +82,8 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,7 +20,7 @@ jobs:
         language: [ 'javascript' ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

diff --git a/package.json b/package.json
@@ -21,27 +21,27 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.21.5",
-    "@babel/core": "7.22.1",
-    "@babel/preset-env": "7.22.4",
-    "@babel/register": "7.21.0",
-    "@commitlint/cli": "17.6.5",
-    "@commitlint/config-angular": "17.6.5",
+    "@babel/cli": "7.23.0",
+    "@babel/core": "7.23.2",
+    "@babel/preset-env": "7.23.2",
+    "@babel/register": "7.22.15",
+    "@commitlint/cli": "18.2.0",
+    "@commitlint/config-angular": "18.1.0",
     "bluebird": "3.7.2",
     "eslint": "7.32.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "4.2.1",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
     "husky": "8.0.3",
-    "lint-staged": "13.2.2",
+    "lint-staged": "15.0.2",
     "mocha": "9.2.2",
     "mysql2": "3.2.0",
     "pg": "latest",
     "pg-hstore": "latest",
     "prettier": "2.8.8",
-    "semver": "7.5.1",
-    "sequelize": "6.32.0",
+    "semver": "7.5.4",
+    "sequelize": "6.33.0",
     "sqlite3": "latest",
     "through2": "4.0.2"
   },

diff --git a/src/helpers/config-helper.js b/src/helpers/config-helper.js
@@ -181,10 +181,11 @@ const api = {
       };
 
       if (urlParts.auth) {
-        result = _.assign(result, {
-          username: urlParts.auth.split(':')[0],
-          password: urlParts.auth.split(':')[1],
-        });
+        const authParts = urlParts.auth.split(':');
+        result.username = authParts[0];
+        if (authParts.length > 1) {
+          result.password = authParts.slice(1).join(':');
+        }
       }
 
       return result;