hjamil-24 · hjamil-24 · Aug 8, 2023 · Aug 8, 2023 · Aug 15, 2023 · Aug 22, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -110,6 +110,10 @@ jobs:
         run: yarn lerna run test-unit-ibmi --scope=@sequelize/core
       - name: Unit tests (core - snowflake)
         run: yarn lerna run test-unit-snowflake --scope=@sequelize/core
+      - name: Unit tests (core - oracle)
+        run: yarn lerna run test-unit-oracle --scope=@sequelize/core
+      - name: Unit tests (oracle package)
+        run: yarn lerna run test-unit --scope=@sequelize/oracle
       - name: SQLite SSCCE
         run: yarn sscce-sqlite3
   test-win:
@@ -235,7 +239,7 @@ jobs:
       matrix:
         node-version: [18, 20]
         database-version: [oldest, latest]
-        dialect: [mysql, mariadb, db2]
+        dialect: [mysql, mariadb, db2, oracle]
     name: ${{ matrix.dialect }} ${{ matrix.database-version }} (Node ${{ matrix.node-version }})
     runs-on: ubuntu-latest
     needs: [unit-test, test-typings]

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/dev/oracle/latest/docker-compose.yml b/dev/oracle/latest/docker-compose.yml
@@ -0,0 +1,20 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+services:
+  oracle-latest:
+    container_name: sequelize-oracle-latest
+    image: gvenzl/oracle-free:23.4-slim
+    environment:
+      ORACLE_PASSWORD: password
+      ORACLE_DATABASE: XEPDB1
+    ports:
+      - 1521:1521
+    healthcheck:
+      test: ['CMD-SHELL', 'sqlplus', 'system/password@localhost:1521/XEPDB1']
+      interval: 3s
+      timeout: 1s
+      retries: 10
+
+networks:
+  default:
+    name: sequelize-oracle-latest-network
diff --git a/dev/oracle/latest/reset.sh b/dev/oracle/latest/reset.sh
@@ -0,0 +1,7 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+docker compose -p sequelize-oracle-latest down --remove-orphans --volumes
diff --git a/dev/oracle/latest/start.sh b/dev/oracle/latest/start.sh
@@ -0,0 +1,18 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+docker compose -p sequelize-oracle-latest down --remove-orphans
+docker compose -p sequelize-oracle-latest up -d
+
+./../../wait-until-healthy.sh sequelize-oracle-latest
+
+sleep 30s
+
+docker cp ../privileges.sql sequelize-oracle-latest:/opt/oracle/.
+
+docker exec -t sequelize-oracle-latest sqlplus system/password@localhost:1521/XEPDB1 @privileges.sql
+
+DIALECT=oracle ts-node ../../check-connection.ts
diff --git a/dev/oracle/latest/stop.sh b/dev/oracle/latest/stop.sh
@@ -0,0 +1,10 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+
+docker compose -p sequelize-oracle-latest down --remove-orphans
+
+echo "Local latest supported Oracle DB instance stopped (if it was running).
diff --git a/dev/oracle/oldest/docker-compose.yml b/dev/oracle/oldest/docker-compose.yml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+services:
+  oracle-oldest:
+    container_name: sequelize-oracle-oldest
+    image: gvenzl/oracle-xe:18-slim
+    environment:
+      ORACLE_PASSWORD: password
+    ports:
+      - 1521:1521
+    healthcheck:
+      test: ['CMD-SHELL', 'sqlplus', 'system/password@XEPDB1']
+      interval: 3s
+      timeout: 1s
+      retries: 10
+
+networks:
+  default:
+    name: sequelize-oracle-oldest-network
diff --git a/dev/oracle/oldest/reset.sh b/dev/oracle/oldest/reset.sh
@@ -0,0 +1,7 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+docker compose -p sequelize-oracle-oldest down --remove-orphans --volumes
diff --git a/dev/oracle/oldest/start.sh b/dev/oracle/oldest/start.sh
@@ -0,0 +1,17 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+docker compose -p sequelize-oracle-oldest down --remove-orphans
+docker compose -p sequelize-oracle-oldest up -d
+
+./../../wait-until-healthy.sh sequelize-oracle-oldest
+
+sleep 30s
+
+docker cp ../privileges.sql sequelize-oracle-oldest:/opt/oracle/.
+docker exec -t sequelize-oracle-oldest sqlplus system/password@XEPDB1 @privileges.sql
+
+DIALECT=oracle ts-node ../../check-connection.ts
diff --git a/dev/oracle/oldest/stop.sh b/dev/oracle/oldest/stop.sh
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+#!/usr/bin/env bash
+set -Eeuxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" # https://stackoverflow.com/a/17744637
+
+docker compose -p sequelize-oracle-oldest down --remove-orphans
+
+echo "Local oldest supported Oracle DB instance stopped (if it was running)."
diff --git a/dev/oracle/privileges.sql b/dev/oracle/privileges.sql
@@ -0,0 +1,6 @@
+-- Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved
+
+create user sequelizetest identified by sequelizepassword;
+grant all privileges to sequelizetest;
+alter user sequelizetest quota unlimited on users;
+exit;
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "test-integration-db2": "yarn lerna run test-integration-db2",
     "test-integration-ibmi": "yarn lerna run test-integration-ibmi",
     "test-integration-snowflake": "yarn lerna run test-integration-snowflake",
+    "test-integration-oracle": "yarn lerna run test-integration-oracle",
     "sync-exports": "lerna run sync-exports",
     "build": "lerna run build",
     "docs": "typedoc",
@@ -34,6 +35,7 @@
     "reset-postgres": "bash dev/postgres/oldest/reset.sh; bash dev/postgres/latest/reset.sh",
     "reset-mssql": "bash dev/mssql/oldest/reset.sh; bash dev/mssql/latest/reset.sh",
     "reset-db2": "bash dev/db2/oldest/reset.sh; bash dev/db2/latest/reset.sh",
+    "reset-oracle": "bash dev/oracle/oldest/reset.sh; bash dev/oracle/latest/reset.sh",
     "reset-all": "concurrently \"npm:reset-*(!all)\"",
     "start-mariadb-oldest": "bash dev/mariadb/oldest/start.sh",
     "start-mariadb-latest": "bash dev/mariadb/latest/start.sh",
@@ -45,13 +47,16 @@
     "start-mssql-latest": "bash dev/mssql/latest/start.sh",
     "start-db2-oldest": "bash dev/db2/oldest/start.sh",
     "start-db2-latest": "bash dev/db2/latest/start.sh",
+    "start-oracle-oldest": "bash dev/oracle/oldest/start.sh",
+    "start-oracle-latest": "bash dev/oracle/latest/start.sh",
     "start-oldest": "concurrently \"npm:start-*-oldest\"",
     "start-latest": "concurrently \"npm:start-*-latest\"",
     "stop-mariadb": "bash dev/mariadb/oldest/stop.sh; bash dev/mariadb/latest/stop.sh",
     "stop-mysql": "bash dev/mysql/oldest/stop.sh; bash dev/mysql/latest/stop.sh",
     "stop-postgres": "bash dev/postgres/oldest/stop.sh; bash dev/postgres/latest/stop.sh",
     "stop-mssql": "bash dev/mssql/oldest/stop.sh; bash dev/mssql/latest/stop.sh",
     "stop-db2": "bash dev/db2/oldest/stop.sh; bash dev/db2/latest/stop.sh",
+    "stop-oracle": "bash dev/oracle/oldest/stop.sh; bash dev/oracle/latest/stop.sh",
     "stop-all": "concurrently \"npm:stop-*(!all)\"",
     "----------------------------------------- SSCCEs ------------------------------------------": "",
     "sscce": "ts-node sscce.ts",
@@ -61,7 +66,8 @@
     "sscce-postgres-native": "cross-env DIALECT=postgres-native yarn sscce",
     "sscce-sqlite3": "cross-env DIALECT=sqlite3 yarn sscce",
     "sscce-mssql": "cross-env DIALECT=mssql yarn sscce",
-    "sscce-db2": "cross-env DIALECT=db2 yarn sscce"
+    "sscce-db2": "cross-env DIALECT=db2 yarn sscce",
+    "sscce-oracle": "cross-env DIALECT=oracle yarn sscce"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "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.",
+  "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, Oracle, and IBM i. It features solid transaction support, relations, eager and lazy loading, read replication and more.",
   "version": "7.0.0-alpha.46",
   "funding": [
     {
@@ -108,6 +108,7 @@
     "sql",
     "sqlserver",
     "snowflake",
+    "oracledb",
     "orm",
     "nodejs",
     "object relational mapper",
@@ -141,7 +142,8 @@
     "test-unit-db2": "cross-env DIALECT=db2 yarn _test-unit",
     "test-unit-ibmi": "cross-env DIALECT=ibmi yarn _test-unit",
     "test-unit-snowflake": "cross-env DIALECT=snowflake yarn _test-unit",
-    "test-unit-all": "yarn test-unit-mariadb && yarn test-unit-mysql && yarn test-unit-postgres && yarn test-unit-mssql && yarn test-unit-sqlite3 && yarn test-unit-snowflake && yarn test-unit-db2 && yarn test-unit-ibmi",
+    "test-unit-oracle": "cross-env DIALECT=oracle yarn _test-unit",
+    "test-unit-all": "yarn test-unit-mariadb && yarn test-unit-mysql && yarn test-unit-postgres && yarn test-unit-mssql && yarn test-unit-sqlite3 && yarn test-unit-snowflake && yarn test-unit-db2 && yarn test-unit-oracle && yarn test-unit-ibmi",
     "test-unit": "yarn test-unit-all",
     "----------------------------------------- integration tests ---------------------------------------------": "",
     "test-integration-mariadb": "cross-env DIALECT=mariadb yarn test-integration",
@@ -153,7 +155,8 @@
     "test-integration-db2": "cross-env DIALECT=db2 yarn test-integration",
     "test-integration-ibmi": "cross-env DIALECT=ibmi yarn test-integration",
     "test-integration-snowflake": "cross-env DIALECT=snowflake yarn test-integration",
-    "test-integration-all": "yarn test-integration-mariadb && yarn test-integration-mysql && yarn test-integration-postgres && yarn test-integration-postgres-native && yarn test-integration-sqlite3 && yarn test-integration-mssql && yarn test-integration-db2 && yarn test-integration-ibmi && yarn test-integration-snowflake",
+    "test-integration-oracle": "cross-env DIALECT=oracle yarn test-integration",
+    "test-integration-all": "yarn test-integration-mariadb && yarn test-integration-mysql && yarn test-integration-postgres && yarn test-integration-postgres-native && yarn test-integration-sqlite3 && yarn test-integration-mssql && yarn test-integration-db2 && yarn test-integration-ibmi && yarn test-integration-snowflake && yarn test-integration-oracle",
     "----------------------------------------- all tests ---------------------------------------------": "",
     "test-mariadb": "cross-env DIALECT=mariadb yarn test",
     "test-mysql": "cross-env DIALECT=mysql yarn test",
@@ -163,6 +166,7 @@
     "test-mssql": "cross-env DIALECT=mssql yarn test",
     "test-db2": "cross-env DIALECT=db2 yarn test",
     "test-ibmi": "cross-env DIALECT=ibmi yarn test",
+    "test-oracle": "cross-env DIALECT=oracle yarn test",
     "----------------------------------------- development ---------------------------------------------": "",
     "build": "node ../../build-packages.mjs core"
   },

diff --git a/packages/core/src/abstract-dialect/dialect.ts b/packages/core/src/abstract-dialect/dialect.ts
@@ -68,6 +68,12 @@ export type DialectSupports = {
   /* does the dialect support returning values for inserted/updated fields */
   returnValues: false | 'output' | 'returning';
 
+  /* does the dialect support returning values for inserted/updated fields in outBinds */
+  returnIntoValues: boolean;
+
+  /* does the dialect support topLevelOrderBy (ORDER BY clasue) to get desired results */
+  topLevelOrderByRequired: boolean;
+
   /* features specific to autoIncrement values */
   autoIncrement: {
     /* does the dialect require modification of insert queries when inserting auto increment fields */
@@ -324,6 +330,8 @@ export abstract class AbstractDialect<
     skipLocked: false,
     finalTable: false,
     returnValues: false,
+    returnIntoValues: false,
+    topLevelOrderByRequired: false,
     autoIncrement: {
       identityInsert: false,
       defaultValue: true,

diff --git a/packages/core/src/abstract-dialect/query-generator-internal.ts b/packages/core/src/abstract-dialect/query-generator-internal.ts
@@ -351,4 +351,12 @@ Only named replacements (:name) are allowed in literal() because we cannot guara
   addLimitAndOffset(_options: AddLimitOffsetOptions): string {
     throw new Error(`addLimitAndOffset has not been implemented in ${this.dialect.name}.`);
   }
+
+  /**
+   * Returns the alias token 'AS' after `FROM` clause.
+   *
+   */
+  getAliasToken() {
+    return 'AS';
+  }
 }
diff --git a/packages/core/src/abstract-dialect/query-generator-typescript.ts b/packages/core/src/abstract-dialect/query-generator-typescript.ts
@@ -658,7 +658,7 @@ export class AbstractQueryGeneratorTypeScript<Dialect extends AbstractDialect =
     }
 
     if (options?.alias) {
-      sql += ` AS ${this.quoteIdentifier(options.alias === true ? tableName.tableName : options.alias)}`;
+      sql += ` ${this.#internals.getAliasToken()} ${this.quoteIdentifier(options.alias === true ? tableName.tableName : options.alias)}`;
     }
 
     if (options?.indexHints) {