Add Ord instance on schema, enables sorted table names in IDE

IHP/IDE/SchemaDesigner/Parser.hs

@@ -31,7 +31,7 @@ parseSchemaSql = do
     let result = runParser parseDDL (cs schemaFilePath) schemaSql
     case result of
         Left error -> pure (Left (cs $ errorBundlePretty error))
-        Right r -> pure (Right r)
+        Right r -> pure (Right (sort r))
 
 type Parser = Parsec Void Text
 
@@ -330,8 +330,8 @@ sqlType = choice $ map optionalArray
 
 expression :: Parser Expression
 expression = do
-    e <- try callExpr <|> varExpr <|> textExpr 
-    space 
+    e <- try callExpr <|> varExpr <|> textExpr
+    space
     pure e
 
 varExpr :: Parser Expression

IHP/IDE/SchemaDesigner/Types.hs

@@ -19,7 +19,7 @@ data Statement
     | AddConstraint { tableName :: Text, constraintName :: Text, constraint :: Constraint }
     | UnknownStatement { raw :: Text }
     | Comment { content :: Text }
-    deriving (Eq, Show)
+    deriving (Eq, Show, Ord)
 
 data CreateTable
   = CreateTable
@@ -28,7 +28,7 @@ data CreateTable
       , primaryKeyConstraint :: PrimaryKeyConstraint
       , constraints :: [Constraint]
       }
-  deriving (Eq, Show)
+  deriving (Eq, Show, Ord)
 
 data Column = Column
     { name :: Text
@@ -37,19 +37,19 @@ data Column = Column
     , notNull :: Bool
     , isUnique :: Bool
     }
-    deriving (Eq, Show)
+    deriving (Eq, Show, Ord)
 
 data OnDelete
     = NoAction
     | Restrict
     | SetNull
     | SetDefault
     | Cascade
-    deriving (Show, Eq)
+    deriving (Show, Eq, Ord)
 
 newtype PrimaryKeyConstraint
   = PrimaryKeyConstraint { primaryKeyColumnNames :: [Text] }
-  deriving (Eq, Show)
+  deriving (Eq, Show, Ord)
 
 data Constraint
     -- | FOREIGN KEY (columnName) REFERENCES referenceTable (referenceColumn) ON DELETE onDelete;
@@ -61,7 +61,7 @@ data Constraint
         }
     | UniqueConstraint
         { columnNames :: [Text] }
-    deriving (Eq, Show)
+    deriving (Eq, Show, Ord)
 
 data Expression =
     -- | Sql string like @'hello'@
@@ -70,7 +70,7 @@ data Expression =
     | VarExpression Text
     -- | Simple call, like @COALESCE(name, 'unknown name')@
     | CallExpression Text [Expression]
-    deriving (Eq, Show)
+    deriving (Eq, Show, Ord)
 
 data PostgresType
     = PUUID
@@ -94,4 +94,4 @@ data PostgresType
     | PJSONB
     | PArray PostgresType
     | PCustomType Text
-    deriving (Eq, Show)
+    deriving (Eq, Show, Ord)