Skip to content

Fixing the incorrect JSON type column definition for the MariaDB dialect #60

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

Fixing the incorrect JSON type column definition for the MariaDB dialect #60

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
17 changes: 14 additions & 3 deletions src/dialects/DialectMariaDB.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ interface IColumnMetadataMariaDB {
COLUMN_COMMENT: string;
TABLE_COMMENT: string;
GENERATION_EXPRESSION: string;
CHECK_CLAUSE: string;
}

interface IIndexMetadataMariaDB {
Expand Down Expand Up @@ -124,7 +125,7 @@ const jsDataTypesMap: { [key: string]: string } = {
multipolygon: 'object',
geometry: 'object',
geometrycollection: 'object',
json: 'string',
json: 'object',
};

const defaultValuesMap: { [key: string]: string } = {
Expand Down Expand Up @@ -236,10 +237,13 @@ export class DialectMariaDB extends Dialect {
c.COLUMN_KEY,
c.EXTRA,
c.COLUMN_COMMENT,
t.TABLE_COMMENT
t.TABLE_COMMENT,
cc.CHECK_CLAUSE
FROM information_schema.columns c
INNER JOIN information_schema.tables t
ON c.TABLE_SCHEMA = t.TABLE_SCHEMA AND c.TABLE_NAME = t.TABLE_NAME
ON c.TABLE_SCHEMA = t.TABLE_SCHEMA AND c.TABLE_NAME = t.TABLE_NAME
LEFT JOIN information_schema.CHECK_CONSTRAINTS cc
ON c.TABLE_SCHEMA = cc.CONSTRAINT_SCHEMA AND c.TABLE_NAME = cc.TABLE_NAME AND c.COLUMN_NAME = cc.CONSTRAINT_NAME
WHERE c.TABLE_SCHEMA='${config.connection.database}' AND c.TABLE_NAME = '${table}'
ORDER BY c.ORDINAL_POSITION;
`;
Expand Down Expand Up @@ -293,6 +297,13 @@ export class DialectMariaDB extends Dialect {
case 'varchar':
columnMetadata.dataType += generatePrecisionSignature(column.CHARACTER_MAXIMUM_LENGTH);
break;

case 'longtext':
if (column.CHECK_CLAUSE == `json_valid(\`${column.COLUMN_NAME}\`)`) {
columnMetadata.dataType = 'DataType.JSON';
columnMetadata.type = 'json';
}
break;
}

// ENUM: add values to data type -> DataType.ENUM('v1', 'v2')
Expand Down