Merge pull request #53 from oracle/async-API

issues 47+

Author: vadim-tropashko

CHANGELOG.md

@@ -25,5 +25,13 @@ Issues up to #51
 
 Further Json to QSQL parsing progress
 
-Performance optimization: from 12 sec down to 6 sec for 1000 line QSQL schema definition 
-in test/profile.js. Faster regression test as well.
+Performance optimization: from 12 sec down to 4.5 sec for 1000 line QSQL schema definition 
+in test/profile.js (test for pk-fk chain of 333 tables, 3 column each; 268 ms for chain of
+50 tables, 20 columns each).
+
+## [1.2.2] - 2024-2-15
+
+Issue #47
+
+Fixed invalid 'Misaligned Table ...' error, exhibited in vscode QSQL extension (yet to be published).
+

dist/quick-erd.js

@@ -739,7 +739,7 @@ class de {
     e.rearrangeDiagram(3, !1), this.paperScroller.centerContent();
   }
 }
-const ue = "1.2.1", fe = {
+const ue = "1.2.2", fe = {
   Diagram: de,
   version: ue
 };

dist/quick-erd.umd.cjs

@@ -73,12 +73,14 @@
 | /api                                    | Generate PL/SQL package API to query, insert, update, and delete data within a table. Adds Oracle auditing, by default AUDIT ALL ON <TABLE NAME>. |
 | /audit                                  | Adds Oracle auditing, by default AUDIT ALL ON <TABLE NAME>. |
 | /auditcols, /audit cols, /audit columns | Automatically adds an UPDATED, UPDATED_BY, INSERTED, and INSERTED_BY columns and the trigger logic to set column values. |
+| /check                                  | table level constraint            |
 | /colprefix                              | Prefix all columns of a given table with this value. Automatically adds an underscore if not provided. |
 | /compress, /compressed                  | Table will be created compressed. |
 | /insert NN                              | Generate NN SQL INSERT statement(s) with random data, for example: /INSERT 20. (Maximum = 1000) |
 | /rest                                   | Generate REST enablement of the table using Oracle REST Data Services (ORDS) |
 | /select                                 | Generate SQL SELECT statement after generating data for each table |
-| /unique                                 | Generate table level unique constraint |
+| /unique, /uk                            | Generate table level unique constraint |
+| /pk                                     | Generate primary key constraint (on table level it is usually a composite key) |
 <!-- markdownlint-enable MD013 -->
 
 ### Star/Snowflake schema relationship direction indicators
@@ -110,7 +112,7 @@ and is usually omitted from QSQL schema definition.
 | Directive                      | Description                                |
 | ------------------------------ | ------------------------------------------ |
 | /idx, /index, /indexed         | Creates a non unique index                 |
-| /unique                        | Creates a unique constraint                |
+| /unique, /uk                   | Creates a unique constraint                |
 | /check                         | Creates a check constraint with comma or white space delimited values e.g. /check Yes, No |
 | /constant                      | When generating data set this column to a constant value. For example /constant NYC. |
 | /default                       | Adds default value if the column is null   |
@@ -121,6 +123,9 @@ and is usually omitted from QSQL schema definition.
 | /between                       | Adds a between check constraint on the column, for example /between 1 and 100 |
 | /hidden, /invisible            | Hidden columns are not displayed using select * from table. |
 | /references, /reference, /fk   | Foreign key references e.g. /references table_name. Note you can reference tables that are not part of your model. |
+| /cascade                       | on delete cascade                          |
+| /setnull                       | on delete set null                         |
+| /references, /reference, /fk   | Foreign key references e.g. /references table_name. Note you can reference tables that are not part of your model. |
 | /pk                            | Identifies column as the primary key of the table. It is recommended not manually specify primary keys and let this app create primary key columns automatically. |
 | --, [comments]                 |  Enclose comments using square brackets or using dash dash syntax |
 <!-- markdownlint-enable MD013 -->
@@ -429,6 +434,8 @@ stmt::= tree
       |  'document' '=' JSON
 
 view::= 'view' view_name table_name+
+       | view_name '=' table_name+
+
 view_name::= identifier
 table_name::= identifier
 column_name::= identifier
@@ -452,11 +459,13 @@ tableDirective::= '/'
       |'insert' integer
       |'rest'
       |'select'
-      |'unique' )
+      |'unique' | 'uk'
+      |'pk'
+      )
 
 columnDirective::= '/'
       ('idx'|'index'|'indexed'
-      |'unique'
+      |'unique'|'uk'
       |'check'
       |'constant'
       |'default'
@@ -467,7 +476,9 @@ columnDirective::= '/'
       |'between'
       |'hidden'|'invisible'
       |'references'|'reference'
-      |'fk'|'pk' )
+      |'fk'
+      |'pk' 
+      )
 
 datatype::=
        'num'|'number'

dist/quick-sql.js

@@ -1,6 +1,6 @@
 {
   "name": "@oracle/quicksql",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Quick SQL to DDL and ERD translator",
   "main": "./dist/quick-sql.umd.cjs",
   "module": "./dist/quick-sql.js",

dist/quick-sql.umd.cjs

@@ -325,8 +325,8 @@ export const quicksql = (function () {
                     if( pkNode == null )
                         continue;
                     let pk = 'id';
-                    if( pkNode.getExplicitPkNode() != null )
-                        pk = pkNode.getExplicitPkNode().parseName();				
+                    if( pkNode.getExplicitPkName() != null )
+                        pk = pkNode.getExplicitPkName();				
 
                     output.links.push({source: this.objPrefix() +parent, source_id: pk,
                                        target: this.objPrefix() + descendants[i].parseName(''), target_id: fk

doc/user/quick-sql-grammar.md

@@ -165,7 +165,7 @@ function guessIndent( lines ) {
     let indent = null;
     for( let i in frequencies ) {
         if( indent == null || frequencies[indent] <= frequencies[i] )
-            indent = i; 
+            indent = parseInt(i); 
     }
     return indent;