Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:Added support for exporting SQL as OracleDB SQL #192

Merged
merged 10 commits into from
Apr 1, 2025
+739 −60
Merged

feat:Added support for exporting SQL as OracleDB SQL #192

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f6920e7
feat:Added support for exporting SQL as OracleDB SQL
Kingpin98k Jul 30, 2024
f4b3177
Merge branch 'main' into pr192
1ilit Mar 8, 2025
8d69030
Merge branch 'main' of https://github.com/drawdb-io/drawdb into oracl…
1ilit Mar 15, 2025
1499bbe
Add parser
1ilit Mar 15, 2025
81b3eea
Import from sql
1ilit Apr 1, 2025
3a52bd6
Merge branch 'main' of https://github.com/drawdb-io/drawdb into oracl…
1ilit Apr 1, 2025
6b5e2fa
Add beta tag
1ilit Apr 1, 2025
4261ddc
Export from generic
1ilit Apr 1, 2025
1ade688
Fix export
1ilit Apr 1, 2025
5d2f8fc
Add import affinity
1ilit Apr 1, 2025
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
7 changes: 7 additions & 0 deletions package-lock.json
View file

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

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
"lexical": "^0.12.5",
"node-sql-parser": "^5.3.8",
"octokit": "^4.0.2",
"oracle-sql-parser": "^0.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hotkeys-hook": "^4.4.1",
Binary file added src/assets/oraclesql-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/oraclesql.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
113 changes: 86 additions & 27 deletions src/components/EditorHeader/ControlPanel.jsx
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ import {
InputNumber,
Tooltip,
Spin,
Tag,
Toast,
Popconfirm,
} from "@douyinfe/semi-ui";
@@ -30,6 +31,7 @@ import {
jsonToSQLite,
jsonToMariaDB,
jsonToSQLServer,
jsonToOracleSQL,
} from "../../utils/exportSQL/generic";
import {
ObjectType,
@@ -793,48 +795,63 @@ export default function ControlPanel({
import_from: {
children: [
{
JSON: fileImport,
function: fileImport,
name: "JSON",
},
{
DBML: () => {
function: () => {
setModal(MODAL.IMPORT);
setImportFrom(IMPORT_FROM.DBML);
},
name: "DBML",
},
],
},
import_from_source: {
...(database === DB.GENERIC && {
children: [
{
MySQL: () => {
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.MYSQL);
},
name: "MySQL",
},
{
PostgreSQL: () => {
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.POSTGRES);
},
name: "PostgreSQL",
},
{
SQLite: () => {
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.SQLITE);
},
name: "SQLite",
},
{
MariaDB: () => {
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.MARIADB);
},
name: "MariaDB",
},
{
MSSQL: () => {
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.MSSQL);
},
name: "MSSQL",
},
{
function: () => {
setModal(MODAL.IMPORT_SRC);
setImportDb(DB.ORACLESQL);
},
name: "Oracle",
label: "Beta",
},
],
}),
@@ -848,7 +865,8 @@ export default function ControlPanel({
...(database === DB.GENERIC && {
children: [
{
MySQL: () => {
name: "MySQL",
function: () => {
setModal(MODAL.CODE);
const src = jsonToMySQL({
tables: tables,
@@ -864,7 +882,8 @@ export default function ControlPanel({
},
},
{
PostgreSQL: () => {
name: "PostgreSQL",
function: () => {
setModal(MODAL.CODE);
const src = jsonToPostgreSQL({
tables: tables,
@@ -880,7 +899,8 @@ export default function ControlPanel({
},
},
{
SQLite: () => {
name: "SQLite",
function: () => {
setModal(MODAL.CODE);
const src = jsonToSQLite({
tables: tables,
@@ -896,7 +916,8 @@ export default function ControlPanel({
},
},
{
MariaDB: () => {
name: "MariaDB",
function: () => {
setModal(MODAL.CODE);
const src = jsonToMariaDB({
tables: tables,
@@ -912,7 +933,8 @@ export default function ControlPanel({
},
},
{
MSSQL: () => {
name: "MSSQL",
function: () => {
setModal(MODAL.CODE);
const src = jsonToSQLServer({
tables: tables,
@@ -927,6 +949,24 @@ export default function ControlPanel({
}));
},
},
{
label: "Beta",
name: "Oracle",
function: () => {
setModal(MODAL.CODE);
const src = jsonToOracleSQL({
tables: tables,
references: relationships,
types: types,
database: database,
});
setExportData((prev) => ({
...prev,
data: src,
extension: "sql",
}));
},
},
],
}),
function: () => {
@@ -949,7 +989,8 @@ export default function ControlPanel({
export_as: {
children: [
{
PNG: () => {
name: "PNG",
function: () => {
toPng(document.getElementById("canvas")).then(function (dataUrl) {
setExportData((prev) => ({
...prev,
@@ -961,7 +1002,8 @@ export default function ControlPanel({
},
},
{
JPEG: () => {
name: "JPEG",
function: () => {
toJpeg(document.getElementById("canvas"), { quality: 0.95 }).then(
function (dataUrl) {
setExportData((prev) => ({
@@ -975,7 +1017,8 @@ export default function ControlPanel({
},
},
{
SVG: () => {
name: "SVG",
function: () => {
const filter = (node) => node.tagName !== "i";
toSvg(document.getElementById("canvas"), { filter: filter }).then(
function (dataUrl) {
@@ -990,7 +1033,8 @@ export default function ControlPanel({
},
},
{
JSON: () => {
name: "JSON",
function: () => {
setModal(MODAL.CODE);
const result = JSON.stringify(
{
@@ -1014,7 +1058,8 @@ export default function ControlPanel({
},
},
{
DBML: () => {
name: "DBML",
function: () => {
setModal(MODAL.CODE);
const result = toDBML({
tables,
@@ -1029,7 +1074,8 @@ export default function ControlPanel({
},
},
{
PDF: () => {
name: "PDF",
function: () => {
const canvas = document.getElementById("canvas");
toJpeg(canvas).then(function (dataUrl) {
const doc = new jsPDF("l", "px", [
@@ -1049,7 +1095,8 @@ export default function ControlPanel({
},
},
{
MERMAID: () => {
name: "Mermaid",
function: () => {
setModal(MODAL.CODE);
const result = jsonToMermaid({
tables: tables,
@@ -1067,7 +1114,8 @@ export default function ControlPanel({
},
},
{
readme: () => {
name: "Markdown",
function: () => {
setModal(MODAL.CODE);
const result = jsonToDocumentation({
tables: tables,
@@ -1271,7 +1319,8 @@ export default function ControlPanel({
theme: {
children: [
{
light: () => {
name: t("light"),
function: () => {
const body = document.body;
if (body.hasAttribute("theme-mode")) {
body.setAttribute("theme-mode", "light");
@@ -1281,7 +1330,8 @@ export default function ControlPanel({
},
},
{
dark: () => {
name: t("dark"),
function: () => {
const body = document.body;
if (body.hasAttribute("theme-mode")) {
body.setAttribute("theme-mode", "dark");
@@ -1602,9 +1652,9 @@ export default function ControlPanel({
const body = document.body;
if (body.hasAttribute("theme-mode")) {
if (body.getAttribute("theme-mode") === "light") {
menu["view"]["theme"].children[1]["dark"]();
menu["view"]["theme"].children[1].function();
} else {
menu["view"]["theme"].children[0]["light"]();
menu["view"]["theme"].children[0].function();
}
}
}}
@@ -1703,7 +1753,7 @@ export default function ControlPanel({
if (menu[category][item].children) {
return (
<Dropdown
style={{ width: "120px" }}
style={{ width: "150px" }}
key={item}
position="rightTop"
render={
@@ -1712,9 +1762,18 @@ export default function ControlPanel({
(e, i) => (
<Dropdown.Item
key={i}
onClick={Object.values(e)[0]}
onClick={e.function}
className="flex justify-between"
>
{t(Object.keys(e)[0])}
<span>{e.name}</span>
{e.label && (
<Tag
size="small"
color="light-blue"
>
{e.label}
</Tag>
)}
</Dropdown.Item>
),
)}
18 changes: 14 additions & 4 deletions src/components/EditorHeader/Modal/Modal.jsx
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ import {
} from "../../../hooks";
import { saveAs } from "file-saver";
import { Parser } from "node-sql-parser";
import { Parser as OracleParser } from "oracle-sql-parser";
import {
getModalTitle,
getModalWidth,
@@ -131,12 +132,21 @@ export default function Modal({
};

const parseSQLAndLoadDiagram = () => {
const parser = new Parser();
const targetDatabase = database === DB.GENERIC ? importDb : database;

let ast = null;
try {
ast = parser.astify(importSource.src, {
database: database === DB.GENERIC ? importDb : database,
});
if (targetDatabase === DB.ORACLESQL) {
const oracleParser = new OracleParser();

ast = oracleParser.parse(importSource.src);
} else {
const parser = new Parser();

ast = parser.astify(importSource.src, {
database: targetDatabase,
});
}
} catch (error) {
const message = error.location
? `${error.name} [Ln ${error.location.start.line}, Col ${error.location.start.column}]: ${error.message}`
Loading