on dev help sign in
fix test error
commit3ade9f354f2c7b4da9aa465fd21704e00d8a3852 authorEitan Chatav <eitan.chatav@gmail.com> dateTue 27 Nov 2018, 15:22 (8 years ago) parent0073a2c
2 files changed+19−19
squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+15−15 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+4−4
squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+15−15
@@ -827,24 +827,24 @@ dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"
827827alterType :: ColumnTypeExpression db ty -> AlterColumn db ty0 ty
828828alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty
829829
830−-- | Create a view.
831−--
832−-- >>> :{
833−-- let
834−-- definition :: Definition
835−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])]]
836−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])
837−-- , "bc" ::: 'View ('["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4])]]
838−-- definition =
839−-- createView #bc (select (#b :* #c) (from (table #abc)))
840−-- in printSQL definition
841−-- :}
842−-- CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";
830+{- | Create a view.
831+>>> type ABC = '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4]
832+>>> type BC = '["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4]
833+>>> :{
834+let
835+ definition :: Definition
836+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC)]]
837+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC), "bc" ::: 'View BC]]
838+ definition =
839+ createView #bc (select (#b :* #c) (from (table #abc)))
840+in printSQL definition
841+:}
842+CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";
843+-}
843844createView
844845 :: (KnownSymbol sch, KnownSymbol vw, Has sch db schema)
845846 => QualifiedAlias sch vw -- ^ the name of the view to add
846− -> Query db '[] view
847− -- ^ query
847+ -> Query db '[] view -- ^ query
848848 -> Definition db (Alter sch (Create vw ('View view) schema) db)
849849createView alias query = UnsafeDefinition $
850850 "CREATE" <+> "VIEW" <+> renderQualifiedAlias alias <+> "AS"
squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+4−4
@@ -480,11 +480,11 @@ instance (q ~ q', a ~ a') => IsQualified q a (QualifiedAlias q' a') where
480480 _!_ = QualifiedAlias
481481instance (q' ~ "public", a ~ a') => IsLabel a (QualifiedAlias q' a') where
482482 fromLabel = QualifiedAlias
483−instance (q ~ q', a ~ a', KnownSymbol a') =>
484− IsQualified q a (Aliased (QualifiedAlias q') (a' ::: a')) where
483+instance (q0 ~ q1, a0 ~ a1, a1 ~ a2, KnownSymbol a2) =>
484+ IsQualified q0 a0 (Aliased (QualifiedAlias q1) (a1 ::: a2)) where
485485 _!_ = QualifiedAlias `As` Alias
486−instance (q' ~ "public", a ~ a', KnownSymbol a') =>
487− IsLabel a (Aliased (QualifiedAlias q') (a' ::: a')) where
486+instance (q ~ "public", a0 ~ a1, a1 ~ a2, KnownSymbol a2) =>
487+ IsLabel a0 (Aliased (QualifiedAlias q) (a1 ::: a2)) where
488488 fromLabel = QualifiedAlias `As` Alias
489489
490490renderQualifiedAlias