Skip to content

Commit 4359ca6

Browse files
authored
fix: primary keys for column tables (#1541)
1 parent 9858369 commit 4359ca6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/containers/Tenant/Schema/SchemaViewer/prepareData.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ export function prepareFamilies(data?: TTableDescription): Record<number, TFamil
4343
function prepareRowTableSchema(data: TTableDescription = {}): SchemaData[] {
4444
const families = prepareFamilies(data);
4545

46-
const {Columns, KeyColumnIds} = data;
46+
const {Columns, KeyColumnNames} = data;
4747

4848
const preparedColumns = Columns?.map((column) => {
4949
const {Id, Name, NotNull, Type, Family, DefaultFromSequence, DefaultFromLiteral} = column;
5050

51-
const keyColumnIndex = KeyColumnIds?.findIndex((keyColumnId) => keyColumnId === Id) ?? -1;
51+
const keyColumnIndex =
52+
KeyColumnNames?.findIndex((keyColumnName) => keyColumnName === Name) ?? -1;
5253

5354
const familyName = Family ? families[Family].Name : undefined;
5455
const prefferedPoolKind = Family
@@ -92,14 +93,15 @@ function prepareExternalTableSchema(data: TExternalTableDescription = {}): Schem
9293

9394
function prepareColumnTableSchema(data: TColumnTableDescription = {}): SchemaData[] {
9495
const {Schema = {}, Sharding = {}} = data;
95-
const {Columns, KeyColumnIds} = Schema;
96+
const {Columns, KeyColumnNames} = Schema;
9697
const {HashSharding = {}} = Sharding;
9798
const {Columns: HashColumns = []} = HashSharding;
9899

99100
const preparedColumns = Columns?.map((column) => {
100101
const {Id, Name, Type, NotNull} = column;
101102

102-
const keyColumnIndex = KeyColumnIds?.findIndex((keyColumnId) => keyColumnId === Id) ?? -1;
103+
const keyColumnIndex =
104+
KeyColumnNames?.findIndex((keyColumnName) => keyColumnName === Name) ?? -1;
103105

104106
const isPartitioningKeyColumn = Boolean(
105107
HashColumns?.find((hashColumnName) => hashColumnName === Name),

0 commit comments

Comments
 (0)