mirror of https://github.com/nocodb/nocodb
աɨռɢӄաօռɢ
2 years ago
committed by
GitHub
23 changed files with 1519 additions and 144 deletions
@ -0,0 +1,16 @@ |
|||||||
|
import { Knex } from 'knex'; |
||||||
|
import { MetaTable } from '../../utils/globals'; |
||||||
|
|
||||||
|
const up = async (knex: Knex) => { |
||||||
|
await knex.schema.alterTable(MetaTable.FILTER_EXP, (table) => { |
||||||
|
table.string('comparison_sub_op'); |
||||||
|
}); |
||||||
|
}; |
||||||
|
|
||||||
|
const down = async (knex) => { |
||||||
|
await knex.schema.alterTable(MetaTable.FILTER_EXP, (table) => { |
||||||
|
table.dropColumns('comparison_sub_op'); |
||||||
|
}); |
||||||
|
}; |
||||||
|
|
||||||
|
export { up, down }; |
||||||
@ -0,0 +1,93 @@ |
|||||||
|
import { NcUpgraderCtx } from './NcUpgrader'; |
||||||
|
import { MetaTable } from '../utils/globals'; |
||||||
|
import NcMetaIO from '../meta/NcMetaIO'; |
||||||
|
import Column from '../models/Column'; |
||||||
|
import Filter from '../models/Filter'; |
||||||
|
import { UITypes } from 'nocodb-sdk'; |
||||||
|
|
||||||
|
// as of 0.105.3, date / datetime filters include `is like` and `is not like` which are not practical
|
||||||
|
// `removeLikeAndNlikeFilters` in this upgrader is simply to remove them
|
||||||
|
|
||||||
|
// besides, `null` and `empty` will be migrated to `blank` in `migrateEmptyAndNullFilters`
|
||||||
|
|
||||||
|
// since the upcoming version will introduce a set of new filters for date / datetime with a new `comparison_sub_op`
|
||||||
|
// `eq` and `neq` would become `is` / `is not` (comparison_op) + `exact date` (comparison_sub_op)
|
||||||
|
// `migrateEqAndNeqFilters` in this upgrader is to add `exact date` in comparison_sub_op
|
||||||
|
|
||||||
|
// Change Summary:
|
||||||
|
// - Date / DateTime columns:
|
||||||
|
// - remove `is like` and `is not like`
|
||||||
|
// - migrate `null` or `empty` filters to `blank`
|
||||||
|
// - add `exact date` in comparison_sub_op for existing filters `eq` and `neq`
|
||||||
|
|
||||||
|
function removeLikeAndNlikeFilters(filter: Filter, ncMeta: NcMetaIO) { |
||||||
|
let actions = []; |
||||||
|
// remove `is like` and `is not like`
|
||||||
|
if (['like', 'nlike'].includes(filter.comparison_op)) { |
||||||
|
actions.push(Filter.delete(filter.id, ncMeta)); |
||||||
|
} |
||||||
|
return actions; |
||||||
|
} |
||||||
|
|
||||||
|
function migrateEqAndNeqFilters(filter: Filter, ncMeta: NcMetaIO) { |
||||||
|
let actions = []; |
||||||
|
// remove `is like` and `is not like`
|
||||||
|
if (['eq', 'neq'].includes(filter.comparison_op)) { |
||||||
|
actions.push( |
||||||
|
Filter.update( |
||||||
|
filter.id, |
||||||
|
{ |
||||||
|
comparison_sub_op: 'exactDate', |
||||||
|
}, |
||||||
|
ncMeta |
||||||
|
) |
||||||
|
); |
||||||
|
} |
||||||
|
return actions; |
||||||
|
} |
||||||
|
|
||||||
|
function migrateEmptyAndNullFilters(filter: Filter, ncMeta: NcMetaIO) { |
||||||
|
let actions = []; |
||||||
|
// remove `is like` and `is not like`
|
||||||
|
if (['empty', 'null'].includes(filter.comparison_op)) { |
||||||
|
// migrate to blank
|
||||||
|
actions.push( |
||||||
|
Filter.update( |
||||||
|
filter.id, |
||||||
|
{ |
||||||
|
comparison_op: 'blank', |
||||||
|
}, |
||||||
|
ncMeta |
||||||
|
) |
||||||
|
); |
||||||
|
} else if (['notempty', 'notnull'].includes(filter.comparison_op)) { |
||||||
|
// migrate to not blank
|
||||||
|
actions.push( |
||||||
|
Filter.update( |
||||||
|
filter.id, |
||||||
|
{ |
||||||
|
comparison_op: 'notblank', |
||||||
|
}, |
||||||
|
ncMeta |
||||||
|
) |
||||||
|
); |
||||||
|
} |
||||||
|
return actions; |
||||||
|
} |
||||||
|
|
||||||
|
export default async function ({ ncMeta }: NcUpgraderCtx) { |
||||||
|
const filters = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP); |
||||||
|
for (const filter of filters) { |
||||||
|
if (!filter.fk_column_id || filter.is_group) { |
||||||
|
continue; |
||||||
|
} |
||||||
|
const col = await Column.get({ colId: filter.fk_column_id }, ncMeta); |
||||||
|
if ([UITypes.Date, UITypes.DateTime].includes(col.uidt)) { |
||||||
|
await Promise.all([ |
||||||
|
...removeLikeAndNlikeFilters(filter, ncMeta), |
||||||
|
...migrateEmptyAndNullFilters(filter, ncMeta), |
||||||
|
...migrateEqAndNeqFilters(filter, ncMeta), |
||||||
|
]); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue