Skip to content

Commit

Permalink
fixing merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
invisal committed Mar 13, 2024
1 parent 3f8252a commit 5610d6c
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 7 deletions.
120 changes: 120 additions & 0 deletions package-lock.json

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

7 changes: 0 additions & 7 deletions src/lib/sql-execute-helper.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
import OptimizeTableState, {
OptimizeTableRowValue,
} from "@/components/table-optimized/OptimizeTableState";
<<<<<<< HEAD
import DatabaseDriver, { DatabaseTableSchema } from "@/drivers/DatabaseDriver";
=======
import DatabaseDriver from "@/drivers/DatabaseDriver";
>>>>>>> develop
import { validateOperation } from "@/lib/validation";
import {
generateDeleteStatement,
generateInsertStatement,
generateSelectOneWithConditionStatement,
generateUpdateStatement,
} from "./sql-helper";
<<<<<<< HEAD
=======
import { DatabaseTableSchema } from "@/drivers/base-driver";
>>>>>>> develop

export interface ExecutePlan {
row: OptimizeTableRowValue;
Expand Down

0 comments on commit 5610d6c

Please sign in to comment.