Add MySQL tests

L-Mario564 · Oct 2, 2024 · 61faf94 · 61faf94
1 parent 17f5d8b
commit 61faf94
Show file tree

Hide file tree

Showing 5 changed files with 516 additions and 14 deletions.
diff --git a/drizzle-kit/src/validate-schema/foreign-key.ts b/drizzle-kit/src/validate-schema/foreign-key.ts
@@ -21,8 +21,8 @@ export class ValidateForeignKey {
   mismatchingDataTypes(foreignKey: Table['foreignKeys'][number]) {
     const { columns, foreignColumns }  = foreignKey.reference;
 
-    const types = `(${columns.map((c) => c.getSQLType()).join(', ')})`;
-    const foreignTypes = `(${foreignColumns.map((c) => c.getSQLType()).join(', ')})`;
+    const types = `(${columns.map((c) => c.sqlType).join(', ')})`;
+    const foreignTypes = `(${foreignColumns.map((c) => c.sqlType).join(', ')})`;
 
     if (types !== foreignTypes) {
       this.errors.push({

diff --git a/drizzle-kit/src/validate-schema/utils.ts b/drizzle-kit/src/validate-schema/utils.ts
@@ -76,15 +76,15 @@ export type Table = {
   foreignKeys: { name: string; reference: {
     columns: {
       name: string;
-      getSQLType: () => string;
+      sqlType: string;
       table: {
         name: string;
         schema?: string;
       };
     }[];
     foreignColumns: {
       name: string;
-      getSQLType: () => string;
+      sqlType: string;
       table: {
         name: string;
         schema?: string;

diff --git a/drizzle-kit/src/validate-schema/validate.ts b/drizzle-kit/src/validate-schema/validate.ts
@@ -121,7 +121,7 @@ export function validatePgSchema(
                   const tableConfig = getPgTableConfig(column.table);
                   return {
                     name: getColumnCasing(column, casing),
-                    getSQLType: column.getSQLType,
+                    sqlType: column.getSQLType(),
                     table: {
                       name: tableConfig.name,
                       schema: tableConfig.schema
@@ -134,7 +134,7 @@ export function validatePgSchema(
                   const tableConfig = getPgTableConfig(column.table);
                   return {
                     name: getColumnCasing(column, casing),
-                    getSQLType: column.getSQLType,
+                    sqlType: column.getSQLType(),
                     table: {
                       name: tableConfig.name,
                       schema: tableConfig.schema
@@ -328,7 +328,7 @@ export function validateMySqlSchema(
                   const tableConfig = getMySqlTableConfig(column.table);
                   return {
                     name: getColumnCasing(column, casing),
-                    getSQLType: column.getSQLType,
+                    sqlType: column.getSQLType(),
                     table: {
                       name: tableConfig.name,
                       schema: tableConfig.schema
@@ -341,7 +341,7 @@ export function validateMySqlSchema(
                   const tableConfig = getMySqlTableConfig(column.table);
                   return {
                     name: getColumnCasing(column, casing),
-                    getSQLType: column.getSQLType,
+                    sqlType: column.getSQLType(),
                     table: {
                       name: tableConfig.name,
                       schema: tableConfig.schema
@@ -406,7 +406,8 @@ export function validateMySqlSchema(
     };
   })();
 
-  const v = new ValidateDatabase().validateSchema(undefined);
+  const vDb = new ValidateDatabase();
+  const v = vDb.validateSchema(undefined);
 
   v
     .constraintNameCollisions(
@@ -441,6 +442,11 @@ export function validateMySqlSchema(
       .validatePrimaryKey(primaryKey.name)
       .columnsMixingTables(primaryKey);
   }
+
+  return {
+    messages: vDb.errors,
+    codes: vDb.errorCodes
+  };
 }
 
 export function validateSQLiteSchema(