fix: type of note field that is string doesn show

packages/dbml-core/__tests__/model_exporter/dbml_exporter/input/comment_tables.in.json

@@ -66,9 +66,7 @@
             }
           },
           "inline_refs": [],
-          "note": {
-            "value": "Status of an order"
-          }
+          "note": "Status of an order"
         },
         {
           "name": "created_at",
@@ -106,6 +104,7 @@
           "column": 2
         }
       },
+      "note": "User orders",
       "indexes": []
     }
   ],
@@ -155,9 +154,7 @@
               "column": 1
             }
           },
-          "note": {
-            "value": "In stock"
-          }
+          "note": "In stock"
         },
         {
           "name": "running_low",

packages/dbml-core/__tests__/model_exporter/dbml_exporter/output/comment_tables.out.dbml

@@ -9,4 +9,5 @@ Table "orders" {
   "user_id" int [unique, not null]
   "status" varchar [note: 'Status of an order']
   "created_at" varchar [note: 'When order created']
+  Note: 'User orders'
 }

packages/dbml-core/__tests__/model_exporter/mysql_exporter/input/comment_tables.in.json

@@ -66,9 +66,7 @@
             }
           },
           "inline_refs": [],
-          "note": {
-            "value": "Status of an order"
-          }
+          "note": "Status of an order"
         },
         {
           "name": "created_at",
@@ -106,6 +104,7 @@
           "column": 2
         }
       },
+      "note": "User orders",
       "indexes": []
     }
   ],
@@ -155,9 +154,7 @@
               "column": 1
             }
           },
-          "note": {
-            "value": "In stock"
-          }
+          "note": "In stock"
         },
         {
           "name": "running_low",

packages/dbml-core/__tests__/model_exporter/mysql_exporter/output/comment_tables.out.sql

@@ -4,3 +4,5 @@ CREATE TABLE `orders` (
   `status` varchar(255) COMMENT 'Status of an order',
   `created_at` varchar(255) COMMENT 'When order created'
 );
+
+ALTER TABLE `orders` COMMENT = 'User orders';

packages/dbml-core/__tests__/model_exporter/postgres_exporter/input/comment_tables.in.json

@@ -106,6 +106,7 @@
           "column": 2
         }
       },
+      "note": "User orders",
       "indexes": []
     }
   ],
@@ -155,9 +156,7 @@
               "column": 1
             }
           },
-          "note": {
-            "value": "In stock"
-          }
+          "note": "In stock"
         },
         {
           "name": "running_low",

packages/dbml-core/__tests__/model_exporter/postgres_exporter/output/comment_tables.out.sql

@@ -11,6 +11,8 @@ CREATE TABLE "orders" (
   "created_at" varchar
 );
 
+COMMENT ON TABLE "orders" IS 'User orders';
+
 COMMENT ON COLUMN "orders"."status" IS 'Status of an order';
 
 COMMENT ON COLUMN "orders"."created_at" IS 'When order created';

packages/dbml-core/src/model_structure/database.js

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { get } from 'lodash';
 import Schema from './schema';
 import Ref from './ref';
 import Enum from './enum';
@@ -25,8 +25,8 @@ class Database extends Element {
     this.generateId();
     this.hasDefaultSchema = false;
     this.schemas = [];
-    this.note = project.note ? project.note.value : null;
-    this.noteToken = project.note ? project.note.token : null;
+    this.note = project.note ? get(project, 'note.value', project.note) : null;
+    this.noteToken = project.note ? get(project, 'note.token', project.noteToken) : null;
     this.databaseType = project.database_type;
     this.name = project.name;
     this.aliases = aliases;

packages/dbml-core/src/model_structure/enum.js

@@ -1,16 +1,17 @@
+import { get } from 'lodash';
 import Element from './element';
 import EnumValue from './enumValue';
 import { shouldPrintSchema } from './utils';
 
 class Enum extends Element {
   constructor ({
-    name, token, values, note, schema,
+    name, token, values, note, schema, noteToken = null,
   } = {}) {
     super(token);
     if (!name) { this.error('Enum must have a name'); }
     this.name = name;
-    this.note = note ? note.value : null;
-    this.noteToken = note ? note.token : null;
+    this.note = note ? get(note, 'value', note) : null;
+    this.noteToken = note ? get(note, 'token', noteToken) : null;
     this.values = [];
     this.fields = [];
     this.schema = schema;

packages/dbml-core/src/model_structure/enumValue.js

@@ -1,14 +1,15 @@
+import { get } from 'lodash';
 import Element from './element';
 
 class EnumValue extends Element {
   constructor ({
-    name, token, note, _enum,
+    name, token, note, _enum, noteToken = null,
   } = {}) {
     super(token);
     if (!name) { this.error('Enum value must have a name'); }
     this.name = name;
-    this.note = note ? note.value : null;
-    this.noteToken = note ? note.token : null;
+    this.note = note ? get(note, 'value', note) : null;
+    this.noteToken = note ? get(note, 'token', noteToken) : null;
     this._enum = _enum;
     this.dbState = this._enum.dbState;
     this.generateId();

packages/dbml-core/src/model_structure/field.js

@@ -1,10 +1,11 @@
+import { get } from 'lodash';
 import Element from './element';
 import { DEFAULT_SCHEMA_NAME } from './config';
 
 class Field extends Element {
   constructor ({
     name, type, unique, pk, token, not_null: notNull, note, dbdefault,
-    increment, table = {},
+    increment, table = {}, noteToken = null,
   } = {}) {
     super(token);
     if (!name) { this.error('Field must have a name'); }
@@ -15,8 +16,8 @@ class Field extends Element {
     this.unique = unique;
     this.pk = pk;
     this.not_null = notNull;
-    this.note = note ? note.value : null;
-    this.noteToken = note ? note.token : null;
+    this.note = note ? get(note, 'value', note) : null;
+    this.noteToken = note ? get(note, 'token', noteToken) : null;
     this.dbdefault = dbdefault;
     this.increment = increment;
     this.endpoints = [];

packages/dbml-core/src/model_structure/schema.js

@@ -1,3 +1,4 @@
+import { get } from 'lodash';
 import Table from './table';
 import Element from './element';
 import Enum from './enum';
@@ -7,16 +8,16 @@ import Ref from './ref';
 
 class Schema extends Element {
   constructor ({
-    name, alias, note, tables = [], refs = [], enums = [], tableGroups = [], token, database = {},
+    name, alias, note, tables = [], refs = [], enums = [], tableGroups = [], token, database = {}, noteToken = null,
   } = {}) {
     super(token);
     this.tables = [];
     this.enums = [];
     this.tableGroups = [];
     this.refs = [];
     this.name = name;
-    this.note = note ? note.value : null;
-    this.noteToken = note ? note.token : null;
+    this.note = note ? get(note, 'value', note) : null;
+    this.noteToken = note ? get(note, 'token', noteToken) : null;
     this.alias = alias;
     this.database = database;
     this.dbState = this.database.dbState;

packages/dbml-core/src/model_structure/table.js

@@ -1,3 +1,4 @@
+import { get } from 'lodash';
 import Element from './element';
 import Field from './field';
 import Index from './indexes';
@@ -6,13 +7,13 @@ import { shouldPrintSchema } from './utils';
 
 class Table extends Element {
   constructor ({
-    name, alias, note, fields = [], indexes = [], schema = {}, token, headerColor,
+    name, alias, note, fields = [], indexes = [], schema = {}, token, headerColor, noteToken = null,
   } = {}) {
     super(token);
     this.name = name;
     this.alias = alias;
-    this.note = note ? note.value : null;
-    this.noteToken = note ? note.token : null;
+    this.note = note ? get(note, 'value', note) : null;
+    this.noteToken = note ? get(note, 'token', noteToken) : null;
     this.headerColor = headerColor;
     this.fields = [];
     this.indexes = [];