Merge branch 'main' into main

Author: akib22

src/components/EditorSidePanel/TypesTab/TypeField.jsx

@@ -78,7 +78,7 @@ export default function TypeField({ data, tid, fid }) {
             })),
             ...types
               .filter(
-                (type) => type.name.toLowerCase() !== data.name.toLowerCase(),
+                (type) => type.name.toLowerCase() !== types[tid].name.toLowerCase(),
               )
               .map((type) => ({
                 label: type.name.toUpperCase(),

src/data/schemas.js

@@ -13,7 +13,7 @@ export const tableSchema = {
           id: { type: ["integer", "string"] },
           name: { type: "string" },
           type: { type: "string" },
-          default: { type: "string" },
+          default: { type: ["string", "number", "boolean"] },
           check: { type: "string" },
           primary: { type: "boolean" },
           unique: { type: "boolean" },
@@ -55,10 +55,10 @@ export const tableSchema = {
       },
     },
     color: { type: "string", pattern: "^#[0-9a-fA-F]{6}$" },
-  },
-  inherits: {
-    type: "array",
-    items: { type: ["string"] },
+    inherits: {
+      type: "array",
+      items: { type: ["string"] },
+    },
   },
   required: ["id", "name", "x", "y", "fields", "comment", "indices", "color"],
 };
@@ -148,7 +148,7 @@ export const jsonSchema = {
           cardinality: { type: "string" },
           updateConstraint: { type: "string" },
           deleteConstraint: { type: "string" },
-          id: { type: "integer" },
+          id: { type: ["integer", "string"] },
         },
         required: [
           "startTableId",

src/utils/exportAs/dbml.js

@@ -29,7 +29,11 @@ function parseDefaultDbml(field, database) {
 }
 
 function columnDefault(field, database) {
-  if (!field.default || field.default.trim() === "") {
+  if (!field.default) {
+    return "";
+  }
+
+  if (typeof field.default === "string" && !field.default.trim()) {
     return "";
   }
 

src/utils/issues.js

@@ -5,7 +5,12 @@ import { isFunction } from "./utils";
 function checkDefault(field, database) {
   if (field.default === "") return true;
   if (isFunction(field.default)) return true;
-  if (!field.notNull && field.default.toLowerCase() === "null") return true;
+  if (
+    !field.notNull &&
+    typeof field === "string" &&
+    field.default.toLowerCase() === "null"
+  )
+    return true;
   if (!dbToTypes[database][field.type].checkDefault) return true;
 
   return dbToTypes[database][field.type].checkDefault(field);
@@ -67,7 +72,11 @@ export function getIssues(diagram) {
         );
       }
 
-      if (field.notNull && field.default.toLowerCase() === "null") {
+      if (
+        field.notNull &&
+        typeof field.default === "string" &&
+        field.default.toLowerCase() === "null"
+      ) {
         issues.push(
           i18n.t("not_null_is_null", {
             tableName: table.name,

src/utils/utils.js

@@ -41,10 +41,12 @@ const keywords = [
   "CURRENT_TIME",
   "CURRENT_TIMESTAMP",
   "LOCALTIME",
-  "LOCALTIMESTAMP"
+  "LOCALTIMESTAMP",
 ];
 
 export function isKeyword(str) {
+  if (typeof str !== "string") return false;
+
   return keywords.includes(str.toUpperCase());
 }