Skip to content

Commit 09ed48c

Browse files
committed
updated types
1 parent ba57261 commit 09ed48c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

meerkat-core/src/column-compatibility-analyzer/column-compatibility-analyzer.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { DatasetRegistry } from '../dataset-registry/dataset-registry';
2-
import { Column, ColumnType, Dataset } from '../dataset-registry/types';
2+
import { Column, Dataset } from '../dataset-registry/types';
3+
import { DimensionType } from '../types/cube-types';
34
import { ColumnCompatibilityAnalyzer } from './column-compatibility-analyzer';
45
import {
56
NAME_EXACT_MATCH,
@@ -10,8 +11,8 @@ import {
1011

1112
class TestableColumnCompatibilityAnalyzer extends ColumnCompatibilityAnalyzer {
1213
public testGetTypeCompatibilityScore(
13-
sourceType: ColumnType,
14-
targetType: ColumnType
14+
sourceType: DimensionType,
15+
targetType: DimensionType
1516
): number {
1617
return this['getTypeCompatibilityScore'](sourceType, targetType);
1718
}

meerkat-core/src/column-compatibility-analyzer/column-compatibility-analyzer.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as deepEqual from 'fast-deep-equal';
22

33
import { DatasetRegistry } from '../dataset-registry/dataset-registry';
4-
import { Column, ColumnType } from '../dataset-registry/types';
4+
import { Column } from '../dataset-registry/types';
5+
import { DimensionType } from '../types/cube-types';
56
import {
67
NAME_EXACT_MATCH,
78
NAME_PARTIAL_MATCH,
@@ -80,8 +81,8 @@ export class ColumnCompatibilityAnalyzer {
8081
}
8182

8283
private getTypeCompatibilityScore(
83-
sourceType: ColumnType,
84-
targetType: ColumnType
84+
sourceType: DimensionType,
85+
targetType: DimensionType
8586
): number {
8687
return sourceType === targetType ? TYPE_COMPATIBILITY_MATCH : 0;
8788
}

meerkat-core/src/dataset-registry/types.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { DimensionType, MeasureType } from '../types/cube-types';
2-
3-
export type ColumnType = DimensionType | MeasureType;
1+
import { DimensionType } from '../types/cube-types';
42

53
export interface Column<T = object> {
64
name: string;
7-
dataType: ColumnType;
5+
dataType: DimensionType;
86
schema?: T;
97
}
108

meerkat-core/src/types/duckdb-serialization-types/serialization/ParseInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export interface RemoveColumnInfo extends AlterTableInfo {
8383
cascade: boolean;
8484
}
8585

86-
export interface ChangeColumnTypeInfo extends AlterTableInfo {
86+
export interface ChangeDimensionTypeInfo extends AlterTableInfo {
8787
column_name: string;
8888
target_type: LogicalType;
8989
expression: ParsedExpression;

0 commit comments

Comments
 (0)