Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 159 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
"react-router-dom": "^6.8.1",
"react-syntax-highlighter": "^15.5.0",
"sqlstring": "^2.3.3",
"uuid": "^9.0.0"
"uuid": "^9.0.0",
"xlsx": "^0.18.5"
},
"optionalDependencies": {
"dmg-license": "^1.0.11"
Expand Down
4 changes: 2 additions & 2 deletions release/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions src/libs/ApplyQueryResultChanges.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { QueryRowBasedResult } from 'types/SqlResult';
import { QueryResult } from 'types/SqlResult';
import { ResultChangeCollectorItem } from './ResultChangeCollector';

export default function applyQueryResultChanges(
result: QueryRowBasedResult,
result: QueryResult,
changes: ResultChangeCollectorItem[]
): QueryRowBasedResult {
): QueryResult {
const newResult = { ...result };
const headers = result.headers;

for (const change of changes) {
for (const col of change.cols) {
newResult.rows[change.row][col.col] = col.value;
newResult.rows[change.row][headers[col.col].name] = col.value;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/libs/GenerateSqlFromChanges.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryRowBasedResult } from 'types/SqlResult';
import { QueryResult } from 'types/SqlResult';
import generateSqlFromChanges from './GenerateSqlFromChanges';
import ResultChangeCollector from './ResultChangeCollector';
import { SqlStatementPlan } from 'types/SqlStatement';
Expand All @@ -24,7 +24,7 @@ test('Generate Sql from changes with primary key', () => {
},
} as unknown as DatabaseSchema;

const data: QueryRowBasedResult = {
const data: QueryResult = {
keys: {},
error: null,
headers: [
Expand All @@ -45,9 +45,9 @@ test('Generate Sql from changes with primary key', () => {
},
],
rows: [
[1, 'Henry', 25],
[2, 'Jenny', 20],
[3, 'Zeus', 30],
{ id: 1, name: 'Henry', age: 25 },
{ id: 2, name: 'Jenny', age: 20 },
{ id: 3, name: 'Zeus', age: 30 },
],
};

Expand Down
9 changes: 5 additions & 4 deletions src/libs/GenerateSqlFromChanges.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResultHeader, QueryRowBasedResult } from 'types/SqlResult';
import { QueryResult, QueryResultHeader } from 'types/SqlResult';
import { DatabaseSchema } from 'types/SqlSchema';
import { ResultChangeCollectorItem } from './ResultChangeCollector';
import { SqlStatementPlan } from 'types/SqlStatement';
Expand Down Expand Up @@ -66,7 +66,7 @@ export function getUpdatableTable(

function getSqlPlanFromChange(
change: ResultChangeCollectorItem,
data: QueryRowBasedResult,
data: QueryResult,
updatable: UpdatableTableDict
): SqlStatementPlan[] {
const changedTable: Record<string, SqlStatementPlan> = {};
Expand All @@ -92,7 +92,8 @@ function getSqlPlanFromChange(
where: updatable[tableName].reduce((a, b) => {
return {
...a,
[b.columnNames]: data.rows[change.row][b.columnNumber],
[b.columnNames]:
data.rows[change.row][headers[b.columnNumber].name],
};
}, {}),
};
Expand All @@ -106,7 +107,7 @@ function getSqlPlanFromChange(

export default function generateSqlFromChanges(
schema: DatabaseSchema,
currentData: QueryRowBasedResult,
currentData: QueryResult,
changes: ResultChangeCollectorItem[]
): SqlStatementPlan[] {
const updatableTables = getUpdatableTable(currentData.headers, schema);
Expand Down
Loading