From b78a064f0e584d196fd7ba736ea8da5cfebf80a1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 21 May 2020 19:16:59 -0500 Subject: [PATCH] refact: changed get rows to export for tables --- core/entities/Table.js | 2 +- core/entities/nodes/FilterNode.js | 2 +- core/entities/nodes/JoinNode.js | 4 ++-- tests/core/tableTests.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/entities/Table.js b/core/entities/Table.js index 6386e52..e92a510 100644 --- a/core/entities/Table.js +++ b/core/entities/Table.js @@ -15,7 +15,7 @@ class Table { } } - getRows = () => this.rows + export = () => this.rows setRows = rows => { const rowsValidation = this._validateRows(rows) diff --git a/core/entities/nodes/FilterNode.js b/core/entities/nodes/FilterNode.js index 3039539..acebcf6 100644 --- a/core/entities/nodes/FilterNode.js +++ b/core/entities/nodes/FilterNode.js @@ -20,7 +20,7 @@ class FilterNode extends Node { } export = () => { - let rows = this.tables.map(t => t.getRows() ).flat() + let rows = this.tables.map(t => t.export() ).flat() let filters = this._createFilterMethods() filters.forEach(f => { diff --git a/core/entities/nodes/JoinNode.js b/core/entities/nodes/JoinNode.js index 3029eea..e630954 100644 --- a/core/entities/nodes/JoinNode.js +++ b/core/entities/nodes/JoinNode.js @@ -8,7 +8,7 @@ class JoinNode extends Node { export = () => { const baseTable = this.tables.find(t => t.label === this.baseTableLabel) - const baseTableRows = baseTable.getRows() + const baseTableRows = baseTable.export() const tablesToJoin = this.tables.filter(t => { return t.label !== this.baseTableLabel }) @@ -17,7 +17,7 @@ class JoinNode extends Node { const foreignTable = tablesToJoin.find(t => { return t.label === joinParam.foreignTable }) - const foreignTableRows = foreignTable.getRows() + const foreignTableRows = foreignTable.export() const mergedRows = baseTableRows.map(baseRow => { const matchingForeignRow = foreignTableRows.find(foreignRow => { diff --git a/tests/core/tableTests.js b/tests/core/tableTests.js index 0a9bc07..6874936 100644 --- a/tests/core/tableTests.js +++ b/tests/core/tableTests.js @@ -40,7 +40,7 @@ const getTableRows = () => { try { const table = new Table(input) - const tableRows = table.getRows() + const tableRows = table.export() if (JSON.stringify(tableRows) === JSON.stringify(expectedOutput)) return true else return false } catch (err) {