diff --git a/e2e/adapter/test/adapter-factory/adapter-factory.test.ts b/e2e/adapter/test/adapter-factory/adapter-factory.test.ts index 2bbf9dc3d3..c19a5757b4 100644 --- a/e2e/adapter/test/adapter-factory/adapter-factory.test.ts +++ b/e2e/adapter/test/adapter-factory/adapter-factory.test.ts @@ -173,7 +173,7 @@ describe("Create Adapter Helper", async () => { config: {}, options: { advanced: { - database: { generateId: false, useNumberId: false }, + database: { generateId: false }, }, }, adapter(args_0) { @@ -231,27 +231,6 @@ describe("Create Adapter Helper", async () => { expect(ids.size).toBe(10); }); - test("Should throw an error if the database doesn't support numeric ids and the user has enabled `useNumberId`", async () => { - let error: any | null = null; - try { - await createTestAdapter({ - config: { - supportsNumericIds: false, - }, - options: { - advanced: { - database: { - useNumberId: true, - }, - }, - }, - }); - } catch (err) { - error = err; - } - expect(error).not.toBeNull(); - }); - describe("Checking for the results of an adapter call, as well as the parameters passed into the adapter call", () => { describe("create", () => { test("Should fill in the missing fields in the result", async () => { @@ -328,7 +307,7 @@ describe("Create Adapter Helper", async () => { ], advanced: { database: { - useNumberId: true, + generateId: "serial", }, }, }, @@ -1654,14 +1633,14 @@ describe("Create Adapter Helper", async () => { expect(parameters.where?.[0]!.field).toEqual("email_address"); }); - test("findOne: Should receive an integer id in where clause if the user has enabled `useNumberId`", async () => { + test("findOne: Should receive an integer id in where clause if the user has enabled `serial`", async () => { const parameters: { where: Where[]; model: string; select?: string[] } = await new Promise(async (r) => { const adapter = await createTestAdapter({ options: { advanced: { database: { - useNumberId: true, + generateId: "serial", }, }, }, @@ -1690,17 +1669,17 @@ describe("Create Adapter Helper", async () => { expect(res).toHaveProperty("id"); expect(res?.id).toEqual("1"); }); - // The where clause should convert the string id value of `"1"` to an int since `useNumberId` is true + // The where clause should convert the string id value of `"1"` to an int since `generateId` is serial. expect(parameters.where[0]!.value).toEqual(1); }); - test("findMany: Should receive an integer id in where clause if the user has enabled `useNumberId`", async () => { + test("findMany: Should receive an integer id in where clause if the user has enabled `serial`", async () => { const parameters: { where: Where[] | undefined; model: string } = await new Promise(async (r) => { const adapter = await createTestAdapter({ options: { advanced: { database: { - useNumberId: true, + generateId: "serial", }, }, }, @@ -1731,7 +1710,7 @@ describe("Create Adapter Helper", async () => { expect(res[0]).toHaveProperty("id"); expect(res[0]!.id).toEqual("1"); }); - // The where clause should convert the string id value of `"1"` to an int since `useNumberId` is true + // The where clause should convert the string id value of `"1"` to an int since `serial` is enabled. expect(parameters.where?.[0]!.value).toEqual(1); }); }); diff --git a/e2e/adapter/test/adapter-factory/basic.ts b/e2e/adapter/test/adapter-factory/basic.ts index cab918c6f6..c51ae74c31 100644 --- a/e2e/adapter/test/adapter-factory/basic.ts +++ b/e2e/adapter/test/adapter-factory/basic.ts @@ -21,10 +21,7 @@ export const normalTestSuite = createTestSuite( return { "init - tests": async () => { const opts = helpers.getBetterAuthOptions(); - expect( - !opts.advanced?.database?.useNumberId && - opts.advanced?.database?.generateId !== "serial", - ).toBeTruthy(); + expect(opts.advanced?.database?.generateId !== "serial").toBeTruthy(); }, ...tests, }; @@ -56,7 +53,6 @@ export const getNormalTestSuiteTests = ( }); const options = getBetterAuthOptions(); if ( - options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial" || options.advanced?.database?.generateId === "uuid" ) { @@ -1687,10 +1683,7 @@ export const getNormalTestSuiteTests = ( throw error; } const options = getBetterAuthOptions(); - if ( - options.advanced?.database?.useNumberId || - options.advanced?.database?.generateId === "serial" - ) { + if (options.advanced?.database?.generateId === "serial") { expect(Number(users[0]!.id)).not.toBeNaN(); } }, diff --git a/packages/cli/src/generators/drizzle.ts b/packages/cli/src/generators/drizzle.ts index 361141e874..a83269c46e 100644 --- a/packages/cli/src/generators/drizzle.ts +++ b/packages/cli/src/generators/drizzle.ts @@ -572,7 +572,7 @@ function generateImport({ !field.bigint, ), ); - const needsInt = !!useNumberId || hasNonBigintNumber; + const needsInt = useNumberId || hasNonBigintNumber; if (needsInt) { coreImports.push("int"); }