Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Fix field precision and size input and parsing

1ilit4a879354122d
diff --git a/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx b/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx
index 46d41df9..ae574ba2 100644
--- a/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx
+++ b/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx
@@ -123,9 +123,9 @@ export default function FieldDetails({ data, tid, index }) {
<div className="font-semibold">Precision</div>
<Input
className="my-2 w-full"
- placeholder="Set precision: (size, d)"
+ placeholder="Set precision: size, d"
validateStatus={
- !data.size || /^\(\d+,\s*\d+\)$|^$/.test(data.size)
+ !data.size || /^\d+,\s*\d+$|^$/.test(data.size)
? "default"
: "error"
}
diff --git a/src/utils/astToDiagram.js b/src/utils/astToDiagram.js
index 40931fc4..3bb650f6 100644
--- a/src/utils/astToDiagram.js
+++ b/src/utils/astToDiagram.js
@@ -60,8 +60,7 @@ export function astToDiagram(ast) {
}
if (d.definition["length"]) {
if (d.definition.scale) {
- field.size =
- "(" + d.definition["length"] + "," + d.definition.scale + ")";
+ field.size = d.definition["length"] + "," + d.definition.scale;
} else {
field.size = d.definition["length"];
}
@@ -114,13 +113,11 @@ export function astToDiagram(ast) {
}
}
});
- tables.push(table);
- tables.forEach((e, i) => {
- e.id = i;
- e.fields.forEach((f, j) => {
- f.id = j;
- });
+ table.fields.forEach((f, j) => {
+ f.id = j;
});
+ table.id = tables.length;
+ tables.push(table);
} else if (e.keyword === "index") {
const index = {};
index.name = e.index;
diff --git a/src/utils/toSQL.js b/src/utils/toSQL.js
index 4720a6ef..28bb4db3 100644
--- a/src/utils/toSQL.js
+++ b/src/utils/toSQL.js
@@ -44,10 +44,7 @@ export function getTypeString(field, dbms = "mysql", baseType = false) {
if (field.type === "UUID") {
return `VARCHAR(36)`;
}
- if (isSized(field.type)) {
- return `${field.type}(${field.size})`;
- }
- if (hasPrecision(field.type)) {
+ if (hasPrecision(field.type) || isSized(field.type)) {
return `${field.type}${field.size ? `(${field.size})` : ""}`;
}
if (field.type === "SET" || field.type === "ENUM") {