Create PostgreSQL parser

backend/lib/azimutt.ex

@@ -329,7 +329,7 @@ defmodule Azimutt do
       %{id: "aml", name: "AML", parse: true, generate: true},
       %{id: "dbml", name: "DBML", parse: false, generate: false},
       %{id: "json", name: "JSON", parse: true, generate: true},
-      %{id: "postgres", name: "PostgreSQL", parse: false, generate: true},
+      %{id: "postgres", name: "PostgreSQL", parse: true, generate: true},
       %{id: "mysql", name: "MySQL", parse: false, generate: false},
       %{id: "oracle", name: "Oracle", parse: false, generate: false},
       %{id: "sqlserver", name: "SQL Server", parse: false, generate: false},

backend/lib/azimutt_web/templates/website/converters/_editors-script.html.heex

@@ -95,6 +95,7 @@
                 if (lang === 'aml') return aml.parseAml(content)
                 if (lang === 'amlv1') return aml.parseAml(content).mapError(errs => errs.filter(e => e.kind !== 'LegacySyntax'))
                 if (lang === 'json') return aml.parseJsonDatabase(content)
+                if (lang === 'postgres') return sql.parseSql(content, 'postgres')
                 return {errors: [{message: 'Unsupported source dialect: ' + lang, kind: 'UnsupportedDialect', level: 'error', offset: {start: 0, end: 100}, position: {start: {line: 1, column: 1}, end: {line: 10, column: 10}}}]}
             } catch (e) {
                 return {errors: [{message: 'Failed to parse ' + lang + (e && e.message ? ': ' + e.message : ''), kind: 'DialectError', level: 'error', offset: {start: 0, end: 100}, position: {start: {line: 1, column: 1}, end: {line: 10, column: 10}}}]}

libs/aml/resources/full.aml

@@ -79,7 +79,7 @@ type slug | anonymous type
 type uid int {tags: [generic]} # alias type
 type cms.post_status (draft, published, archived) # enum type
 type position {x int, y int} # struct type
-type box `(INTERNALLENGTH = 16, INPUT = lower, OUTPUT = lower)` # custom type
+type box `(INPUT = lower, OUTPUT = lower, INTERNALLENGTH = 16)` # custom type
 
 namespace social.
 

libs/aml/resources/full.json

@@ -224,7 +224,7 @@
     {"name": "uid", "alias": "int", "extra": {"line": 79, "statement": 15, "tags": ["generic"], "comment": "alias type"}},
     {"schema": "cms", "name": "post_status", "values": ["draft", "published", "archived"], "extra": {"line": 80, "statement": 16, "comment": "enum type"}},
     {"name": "position", "attrs": [{"name": "x", "type": "int"}, {"name": "y", "type": "int"}], "extra": {"line": 81, "statement": 17, "comment": "struct type"}},
-    {"name": "box", "definition": "(INTERNALLENGTH = 16, INPUT = lower, OUTPUT = lower)", "extra": {"line": 82, "statement": 18, "comment": "custom type"}}
+    {"name": "box", "definition": "(INPUT = lower, OUTPUT = lower, INTERNALLENGTH = 16)", "extra": {"line": 82, "statement": 18, "comment": "custom type"}}
   ],
   "extra": {
     "comments": [{"line": 1, "comment": ""}, {"line": 2, "comment": "Full Schema AML"}, {"line": 3, "comment": ""}],

libs/aml/resources/full.md

@@ -165,7 +165,7 @@ STRUCT:
 
 ### box
 
-EXPRESSION: (INTERNALLENGTH = 16, INPUT = lower, OUTPUT = lower)
+EXPRESSION: (INPUT = lower, OUTPUT = lower, INTERNALLENGTH = 16)
 
 ## Diagram
 

libs/models/src/parserResult.ts

@@ -61,7 +61,7 @@ export const tokenPosition = (offsetStart: number, offsetEnd: number, positionSt
     ({offset: {start: offsetStart, end: offsetEnd}, position: {start: {line: positionStartLine, column: positionStartColumn}, end: {line: positionEndLine, column: positionEndColumn}}})
 
 export const mergePositions = (positions: (TokenPosition | undefined)[]): TokenPosition => {
-    const pos: TokenPosition[] = positions.filter(isNotUndefined)
+    const pos: TokenPosition[] = positions.filter(isNotUndefined).filter(p => !!p.offset)
     return ({
         offset: {start: posStart(pos.map(p => p.offset.start)), end: posEnd(pos.map(p => p.offset.end))},
         position: {

libs/parser-sql/resources/complex.postgres.sql

@@ -0,0 +1,28 @@
+--
+-- A file with several statements more or less complex to check the parser is works fine.
+-- They don't make sense for a particular db ^^
+--
+
+/*
+ * first query
+ * Author: Loïc
+ */
+select id /* primary key */, name
+from users -- table
+where role = 'admin';
+
+DROP TABLE IF EXISTS users, public.posts CASCADE;
+
+CREATE TABLE users (
+    id int PRIMARY KEY,
+    first_name varchar NOT NULL,
+    last_name varchar NOT NULL,
+    CONSTRAINT name_uniq UNIQUE (first_name, last_name),
+    email varchar UNIQUE CHECK ( email LIKE '%@%' ),
+    role varchar DEFAULT 'guest'
+);
+
+CREATE TABLE public.posts (
+    id int PRIMARY KEY,
+    author int CONSTRAINT posts_author_fk REFERENCES users(id)
+);

libs/parser-sql/resources/full.postgres.sql

@@ -16,7 +16,7 @@ COMMENT ON TYPE slug IS 'anonymous type';
 -- CREATE TYPE uid AS int; -- type alias not supported on PostgreSQL
 CREATE TYPE cms.post_status AS ENUM ('draft', 'published', 'archived');
 CREATE TYPE position AS (x int, y int);
-CREATE TYPE box (INTERNALLENGTH = 16, INPUT = lower, OUTPUT = lower);
+CREATE TYPE box (INPUT = lower, OUTPUT = lower, INTERNALLENGTH = 16);
 
 --
 -- Full Schema AML

libs/parser-sql/src/errors.ts

@@ -0,0 +1,4 @@
+import {ParserError, ParserErrorLevel, TokenPosition} from "@azimutt/models";
+
+export const duplicated = (name: string, definedAtLine: number | undefined, position: TokenPosition): ParserError =>
+    ({message: `${name} already defined${definedAtLine !== undefined ? ` at line ${definedAtLine}` : ''}`, kind: 'Duplicated', level: ParserErrorLevel.enum.warning, offset: position.offset, position: position.position})