Test for deeply nested through joins.

dev/create-sequelize-instance.ts

@@ -1,15 +1,21 @@
-import type { Options as Sequelize6Options } from 'sequelize';
-import { Sequelize as Sequelize6 } from 'sequelize';
-import type { Options as Sequelize7Options, Sequelize as Sequelize7 } from '@sequelize/core';
-import { wrapOptions } from './wrap-options';
+import type { Options as Sequelize6Options } from "sequelize";
+import { Sequelize as Sequelize6 } from "sequelize";
+import type {
+  Options as Sequelize7Options,
+  Sequelize as Sequelize7,
+} from "@sequelize/core";
+import { wrapOptions, wrapOptionsV7 } from "./wrap-options";
 
-export function createSequelize6Instance(options?: Sequelize6Options): Sequelize6 {
+export function createSequelize6Instance(
+  options?: Sequelize6Options
+): Sequelize6 {
   return new Sequelize6(wrapOptions(options));
 }
 
-export function createSequelize7Instance(options?: Sequelize7Options): Sequelize7 {
+export function createSequelize7Instance(
+  options?: Sequelize7Options<any>
+): Sequelize7 {
   // not compatible with node 10
-  const { Sequelize: Sequelize7Constructor } = require('@sequelize/core');
-  // @ts-expect-error -- wrapOptions expect sequelize 6.
-  return new Sequelize7Constructor(wrapOptions(options));
+  const { Sequelize: Sequelize7Constructor } = require("@sequelize/core");
+  return new Sequelize7Constructor(wrapOptionsV7(options));
 }

dev/wrap-options.ts

@@ -1,15 +1,24 @@
-import defaults from 'lodash/defaults.js';
-import { CiDbConfigs } from './ci-db-configs';
-import { log } from './logging';
-import type { Dialect, Options } from 'sequelize';
+import defaults from "lodash/defaults.js";
+import { CiDbConfigs } from "./ci-db-configs";
+import { log } from "./logging";
+import type {
+  Dialect as Sequelize6Dialect,
+  Options as Sequelize6Options,
+} from "sequelize";
+import type {
+  Options as Sequelize7Options,
+  Sequelize as Sequelize7,
+} from "@sequelize/core";
 
-export function wrapOptions(options: Options = {}) {
+export function wrapOptions(options: Sequelize6Options = {}) {
   if (!process.env.DIALECT) {
-    throw new Error('Dialect is not defined! Aborting.');
+    throw new Error("Dialect is not defined! Aborting.");
   }
 
-  const isPostgresNative = process.env.DIALECT === 'postgres-native';
-  const dialect = (isPostgresNative ? 'postgres' : process.env.DIALECT) as Dialect;
+  const isPostgresNative = process.env.DIALECT === "postgres-native";
+  const dialect = (
+    isPostgresNative ? "postgres" : process.env.DIALECT
+  ) as Sequelize6Dialect;
 
   // this fails in the CI due to mismatch between Sequelize 6 & 7. Should be resolved once we drop Sequelize 6.
   // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
@@ -31,3 +40,35 @@ export function wrapOptions(options: Options = {}) {
 
   return options;
 }
+
+export function wrapOptionsV7(options: Partial<Sequelize7Options<any>> = {}) {
+  if (!process.env.DIALECT) {
+    throw new Error("Dialect is not defined! Aborting.");
+  }
+
+  const isPostgresNative = process.env.DIALECT === "postgres-native";
+  const dialect = isPostgresNative ? "postgres" : process.env.DIALECT;
+
+  // Get the CI config for this dialect
+  const config = CiDbConfigs[dialect as keyof typeof CiDbConfigs] as any;
+
+  // Transform Sequelize v6-style options to v7-style
+  const transformedConfig = { ...config };
+  if (transformedConfig.username) {
+    transformedConfig.user = transformedConfig.username;
+    delete transformedConfig.username;
+  }
+
+  const finalOptions = {
+    dialect: dialect,
+    logging: log,
+    ...transformedConfig,
+    ...options,
+  };
+
+  if (isPostgresNative) {
+    finalOptions.native = true;
+  }
+
+  return finalOptions;
+}