Skip to content

Commit 1861bae

Browse files
committed
fix typo in columnToRpgFieldName and test
1 parent 572a53a commit 1861bae

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/views/results/codegen.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ test('Column to RPG symbol', () => {
1414
name = columnToRpgFieldName({display_size: 0, label: 'Cust.number....:', name: 'ANDBEN', type: 'CHAR', precision: 10, scale: 0}, 'Label');
1515
expect(name).toBe('cust_number');
1616

17-
name = columnToRpgFieldName({display_size: 0, label: 'Country:', name: 'ANDBEN', type: 'CHAR', precision: 10, scale: 0}, 'Label');
17+
name = columnToRpgFieldName({display_size: 0, label: 'Country:', name: 'C1', type: 'CHAR', precision: 10, scale: 0}, 'Label');
1818
expect(name).toBe('country');
1919

20-
name = columnToRpgFieldName({display_size: 0, label: 'På bærtur', name: 'ANDBEN', type: 'CHAR', precision: 10, scale: 0}, 'Label');
20+
name = columnToRpgFieldName({display_size: 0, label: 'På bærtur', name: 'PB1', type: 'CHAR', precision: 10, scale: 0}, 'Label');
2121
expect(name).toBe('paa_baertur');
2222

23+
name = columnToRpgFieldName({display_size: 0, label: 'öäß', name: 'ABCD', type: 'CHAR', precision: 10, scale: 0}, 'Label');
24+
expect(name).toBe('oas');
25+
2326
name = columnToRpgFieldName({display_size: 0, label: '', name: '0001', type: 'INTEGER', precision: 0, scale: 0}, 'Name');
2427
expect(name).toBe('col0001');
2528
});

src/views/results/codegen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function columnToRpgFieldName(column: ColumnMetaData, source: string = 'N
1414
let name = source === 'Label' ? column.label.toLowerCase().trim() : column.name.toLowerCase().trim();
1515
name = name.replace(/\u00fc/g, "u") // ü -> u
1616
.replace(/\u00e4/g, "a") // ä -> a
17-
.replace(/\u00e4/g, "o") // ö -> o
17+
.replace(/\u00f6/g, "o") // ö -> o
1818
.replace(/\u00df/g, "s") // sharp s/Eszett -> s
1919
.replace(/\u00e6/g, "ae") // æ -> ae
2020
.replace(/\u00f8/g, "oe") // ø -> oe

0 commit comments

Comments
 (0)