Skip to content

Fix #97 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #97 #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/schemaMysql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,14 @@ export class MysqlDatabase implements Database {
params
)
rawEnumRecords.forEach((enumItem: { column_name: string, column_type: string, data_type: string }) => {
const enumName = MysqlDatabase.getEnumNameFromColumn(enumItem.data_type, enumItem.column_name)
const enumValues = MysqlDatabase.parseMysqlEnumeration(enumItem.column_type)
const dataType = enumItem.data_type || enumItem.DATA_TYPE
const columnType = enumItem.column_type || enumItem.COLUMN_TYPE
const columnName = enumItem.column_name || enumItem.COLUMN_NAME
const enumName = MysqlDatabase.getEnumNameFromColumn(dataType, columnName)
const enumValues = MysqlDatabase.parseMysqlEnumeration(columnType)
if (enums[enumName] && !isEqual(enums[enumName], enumValues)) {
const errorMsg = `Multiple enums with the same name and contradicting types were found: ` +
`${enumItem.column_name}: ${JSON.stringify(enums[enumName])} and ${JSON.stringify(enumValues)}`
`${enumItem.column_name || enumItem.COLUMN_NAME}: ${JSON.stringify(enums[enumName])} and ${JSON.stringify(enumValues)}`
throw new Error(errorMsg)
}
enums[enumName] = enumValues
Expand Down