Implement inherits for Schema.sql

CONTRIBUTING.md

@@ -78,12 +78,16 @@ Note that it takes around 30 minutes for the IHP GitHub actions to prepare a bin
 
 
 When making changes to the development tooling, we have to start the server differently, without `devenv up`. We have to
-use `make console` to load your application together with the framework located in `IHP`.
+use `ghci` to load your application together with the framework located in `IHP`.
 
 ```
 ghci
-:l IHP/exe/IHP/IDE/DevServer.hs
-main
+
+-- Load the development server
+ :l ihp-ide/exe/IHP/IDE/DevServer.hs
+
+--  Run the IHP project in the parent project directory
+mainInParentDirectory
 ```
 
 We don't need to start postgres as the IDE starts it automatically.

IHP/QueryBuilder.hs

@@ -164,8 +164,7 @@ class HasQueryBuilder queryBuilderProvider joinRegister | queryBuilderProvider -
     getQueryBuilder :: queryBuilderProvider table -> QueryBuilder table
     injectQueryBuilder :: QueryBuilder table -> queryBuilderProvider table
     getQueryIndex :: queryBuilderProvider table -> Maybe ByteString
-    getQueryIndex _ = Nothing
-    {-# INLINE getQueryIndex #-}
+    getQueryIndex _ = Nothing 
 
 -- Wrapper for QueryBuilders resulting from joins. Associates a joinRegister type.
 newtype JoinQueryBuilderWrapper joinRegister table = JoinQueryBuilderWrapper (QueryBuilder table)
@@ -179,31 +178,22 @@ newtype LabeledQueryBuilderWrapper foreignTable indexColumn indexValue table = L
 -- QueryBuilders have query builders and the join register is empty.
 instance HasQueryBuilder QueryBuilder EmptyModelList where
     getQueryBuilder = id
-    {-# INLINE getQueryBuilder #-}
     injectQueryBuilder = id
-    {-# INLINE injectQueryBuilder #-}
 
 -- JoinQueryBuilderWrappers have query builders
 instance HasQueryBuilder (JoinQueryBuilderWrapper joinRegister) joinRegister where
     getQueryBuilder (JoinQueryBuilderWrapper queryBuilder) = queryBuilder
-    {-# INLINE getQueryBuilder #-}
     injectQueryBuilder = JoinQueryBuilderWrapper 
-    {-# INLINE injectQueryBuilder #-}
 
 -- NoJoinQueryBuilderWrapper have query builders and the join register does not allow any joins
 instance HasQueryBuilder NoJoinQueryBuilderWrapper NoJoins where
     getQueryBuilder (NoJoinQueryBuilderWrapper queryBuilder) = queryBuilder
-    {-# INLINE getQueryBuilder #-}
     injectQueryBuilder  = NoJoinQueryBuilderWrapper 
-    {-# INLINE injectQueryBuilder #-}
 
 instance (KnownSymbol foreignTable, foreignModel ~ GetModelByTableName foreignTable , KnownSymbol indexColumn, HasField indexColumn foreignModel indexValue) => HasQueryBuilder (LabeledQueryBuilderWrapper foreignTable indexColumn indexValue) NoJoins where
     getQueryBuilder (LabeledQueryBuilderWrapper queryBuilder) = queryBuilder
-    {-# INLINE getQueryBuilder #-}
     injectQueryBuilder = LabeledQueryBuilderWrapper
-    {-# INLINE injectQueryBuilder #-}
     getQueryIndex _ = Just $ symbolToByteString @foreignTable <> "." <> (Text.encodeUtf8 . fieldNameToColumnName) (symbolToText @indexColumn)
-    {-# INLINE getQueryIndex #-}
 
 
 data QueryBuilder (table :: Symbol) =

Test/IDE/CodeGeneration/ControllerGenerator.hs

@@ -31,6 +31,7 @@ tests = do
                         , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                         , constraints = []
                         , unlogged = False
+                        , inherits = Nothing
                     },
                     StatementCreateTable CreateTable {
                         name = "people"
@@ -65,6 +66,7 @@ tests = do
                         , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                         , constraints = []
                         , unlogged = False
+                        , inherits = Nothing
                     }
                 ]
 

Test/IDE/CodeGeneration/MailGenerator.hs

@@ -32,6 +32,7 @@ tests = do
                         , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                         , constraints = []
                         , unlogged = False
+                        , inherits = Nothing
                         }
                     ]
         it "should build a mail with name \"PurchaseConfirmationMail\"" do

Test/IDE/CodeGeneration/ViewGenerator.hs

@@ -32,6 +32,7 @@ tests = do
                         , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                         , constraints = []
                         , unlogged = False
+                        , inherits = Nothing
                         }
                     ]
         it "should build a view with name \"EditView\"" do

Test/IDE/SchemaDesigner/CompilerSpec.hs

@@ -15,7 +15,7 @@ import Test.IDE.SchemaDesigner.ParserSpec (col, parseSql)
 tests = do
     describe "The Schema.sql Compiler" do
         it "should compile an empty CREATE TABLE statement" do
-            compileSql [StatementCreateTable CreateTable { name = "users", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False }] `shouldBe` "CREATE TABLE users (\n\n);\n"
+            compileSql [StatementCreateTable CreateTable { name = "users", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False, inherits = Nothing }] `shouldBe` "CREATE TABLE users (\n\n);\n"
 
         it "should compile a CREATE EXTENSION for the UUID extension" do
             compileSql [CreateExtension { name = "uuid-ossp", ifNotExists = True }] `shouldBe` "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";\n"
@@ -109,11 +109,12 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
         it "should compile a CREATE TABLE with quoted identifiers" do
-            compileSql [StatementCreateTable CreateTable { name = "quoted name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False }] `shouldBe` "CREATE TABLE \"quoted name\" (\n\n);\n"
+            compileSql [StatementCreateTable CreateTable { name = "quoted name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False, inherits = Nothing }] `shouldBe` "CREATE TABLE \"quoted name\" (\n\n);\n"
 
         it "should compile ALTER TABLE .. ADD FOREIGN KEY .. ON DELETE CASCADE" do
             let statement = AddConstraint
@@ -478,6 +479,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -530,6 +532,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -545,6 +548,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                     , constraints = [ UniqueConstraint { name = Nothing, columnNames = [ "user_id", "follower_id" ] } ]
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -556,6 +560,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -567,6 +572,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -581,6 +587,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint ["order_id", "truck_id"]
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -592,6 +599,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -603,6 +611,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -614,6 +623,7 @@ tests = do
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []
                     , unlogged = False
+                    , inherits = Nothing
                     }
             compileSql [statement] `shouldBe` sql
 
@@ -628,7 +638,7 @@ tests = do
                     , indexType = Nothing
                     }
             compileSql [statement] `shouldBe` sql
-        
+
         it "should escape an index name inside a 'CREATE INDEX' statement" do
             let sql = cs [plain|CREATE INDEX "Some Index" ON "Some Table" ("Some Col");\n|]
             let statement = CreateIndex
@@ -787,12 +797,12 @@ tests = do
 
         it "should compile a decimal default value with a type-cast" do
             let sql = "CREATE TABLE a (\n    electricity_unit_price DOUBLE PRECISION DEFAULT 0.17::DOUBLE PRECISION NOT NULL\n);\n"
-            let statement = StatementCreateTable CreateTable { name = "a", columns = [Column {name = "electricity_unit_price", columnType = PDouble, defaultValue = Just (TypeCastExpression (DoubleExpression 0.17) PDouble), notNull = True, isUnique = False, generator = Nothing}], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False }
+            let statement = StatementCreateTable CreateTable { name = "a", columns = [Column {name = "electricity_unit_price", columnType = PDouble, defaultValue = Just (TypeCastExpression (DoubleExpression 0.17) PDouble), notNull = True, isUnique = False, generator = Nothing}], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False, inherits = Nothing }
             compileSql [statement] `shouldBe` sql
 
         it "should compile a integer default value" do
             let sql = "CREATE TABLE a (\n    electricity_unit_price INT DEFAULT 0 NOT NULL\n);\n"
-            let statement = StatementCreateTable CreateTable { name = "a", columns = [Column {name = "electricity_unit_price", columnType = PInt, defaultValue = Just (IntExpression 0), notNull = True, isUnique = False, generator = Nothing}], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False }
+            let statement = StatementCreateTable CreateTable { name = "a", columns = [Column {name = "electricity_unit_price", columnType = PInt, defaultValue = Just (IntExpression 0), notNull = True, isUnique = False, generator = Nothing}], primaryKeyConstraint = PrimaryKeyConstraint [], constraints = [], unlogged = False, inherits = Nothing }
             compileSql [statement] `shouldBe` sql
 
         it "should compile a partial index" do
@@ -841,7 +851,7 @@ tests = do
                         )
                     }
             compileSql [policy] `shouldBe` sql
-        
+
         it "should compile 'CREATE POLICY' statements with a 'ihp_user_id() IS NOT NULL' expression" do
             -- https://github.com/digitallyinduced/ihp/issues/1412
             let sql = "CREATE POLICY \"Users can manage tasks if logged in\" ON tasks USING (ihp_user_id() IS NOT NULL) WITH CHECK (ihp_user_id() IS NOT NULL);\n"
@@ -1030,6 +1040,7 @@ tests = do
                             , primaryKeyConstraint = PrimaryKeyConstraint []
                             , constraints = []
                             , unlogged = False
+                            , inherits = Nothing
                             }
                         ]
             compileSql statements `shouldBe` sql
@@ -1040,16 +1051,17 @@ tests = do
         it "should compile 'CREATE UNLOGGED TABLE' statements" do
             let sql = [trimming|
                 CREATE UNLOGGED TABLE pg_large_notifications (
-                
+
                 );
             |] <> "\n"
             let statements = [
                         StatementCreateTable CreateTable
                             { name = "pg_large_notifications"
                             , columns = []
+                            , primaryKeyConstraint = PrimaryKeyConstraint []
                             , constraints = []
                             , unlogged = True
-                            , primaryKeyConstraint = PrimaryKeyConstraint []
+                            , inherits = Nothing
                             }
                         ]
             compileSql statements `shouldBe` sql
@@ -1067,4 +1079,23 @@ tests = do
                             , check = Just (VarExpression "false")
                             }
                         ]
-            compileSql statements `shouldBe` sql
+            compileSql statements `shouldBe` sql
+
+        it "should compile a CREATE TABLE statement with INHERITS" do
+            let sql = "CREATE TABLE child_table (\n    id UUID PRIMARY KEY\n) INHERITS (parent_table);\n"
+            let statement = StatementCreateTable CreateTable
+                    { name = "child_table"
+                    , columns = [Column
+                        { name = "id"
+                        , columnType = PUUID
+                        , defaultValue = Nothing
+                        , notNull = False
+                        , isUnique = False
+                        , generator = Nothing
+                        }]
+                    , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
+                    , constraints = []
+                    , unlogged = False
+                    , inherits = Just "parent_table"
+                    }
+            compileSql [statement] `shouldBe` sql

Test/IDE/SchemaDesigner/Controller/HelperSpec.hs

@@ -14,14 +14,14 @@ tests = do
                 getAllObjectNames [ CreateExtension { name ="a", ifNotExists = True } ] `shouldBe` []
                 getAllObjectNames [ CreateEnumType { name = "first_enum", values=["a", "b", "c"] }] `shouldBe` ["first_enum"]
                 getAllObjectNames [ StatementCreateTable CreateTable
-                                        { name = "table_name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints=[], unlogged = False }
+                                        { name = "table_name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints=[], unlogged = False, inherits = Nothing }
                                   ]
                     `shouldBe` ["table_name"]
                 getAllObjectNames
                     [ CreateEnumType {name = "first_enum", values = ["a", "b"]}
                     , CreateExtension {name = "extension", ifNotExists = True}
                     , StatementCreateTable CreateTable
-                        { name = "table_name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints=[], unlogged = False }
+                        { name = "table_name", columns = [], primaryKeyConstraint = PrimaryKeyConstraint [], constraints=[], unlogged = False, inherits = Nothing }
                     , CreateEnumType {name = "second_enum", values = []}
                     ]
                     `shouldBe` ["first_enum","table_name","second_enum"]