3ade9f3 · squeal · git.iko.soy

git.iko.soy/squeal

on dev help sign in

fix test error

3ade9f3Eitan Chatav8 years ago

squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+15−15

compare with dev

unifiedsplit

@@ -827,24 +827,24 @@ dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"

827alterType :: ColumnTypeExpression db ty -> AlterColumn db ty0 ty

828alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty

829

830−-- | Create a view.

830+{- | Create a view.

831−--

831+>>> type ABC = '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4]

832+>>> type BC = '["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4]

832−-- >>> :{

833+>>> :{

833−-- let

834+let

834−-- definition :: Definition

835+ definition :: Definition

835−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])]]

836+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC)]]

836−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])

837+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC), "bc" ::: 'View BC]]

837−-- , "bc" ::: 'View ('["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4])]]

838−-- definition =

838+ definition =

839−-- createView #bc (select (#b :* #c) (from (table #abc)))

839+ createView #bc (select (#b :* #c) (from (table #abc)))

840−-- in printSQL definition

840+in printSQL definition

841−-- :}

841+:}

842−-- CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";

842+CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";

843+-}

843createView

844createView

844 :: (KnownSymbol sch, KnownSymbol vw, Has sch db schema)

845 :: (KnownSymbol sch, KnownSymbol vw, Has sch db schema)

845 => QualifiedAlias sch vw -- ^ the name of the view to add

846 => QualifiedAlias sch vw -- ^ the name of the view to add

846− -> Query db '[] view

847+ -> Query db '[] view -- ^ query

847− -- ^ query

848 -> Definition db (Alter sch (Create vw ('View view) schema) db)

849createView alias query = UnsafeDefinition $

850 "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

480 _!_ = QualifiedAlias

481instance (q' ~ "public", a ~ a') => IsLabel a (QualifiedAlias q' a') where

482 fromLabel = QualifiedAlias

483−instance (q ~ q', a ~ a', KnownSymbol a') =>

483+instance (q0 ~ q1, a0 ~ a1, a1 ~ a2, KnownSymbol a2) =>

484− IsQualified q a (Aliased (QualifiedAlias q') (a' ::: a')) where

484+ IsQualified q0 a0 (Aliased (QualifiedAlias q1) (a1 ::: a2)) where

485 _!_ = QualifiedAlias `As` Alias

486−instance (q' ~ "public", a ~ a', KnownSymbol a') =>

486+instance (q ~ "public", a0 ~ a1, a1 ~ a2, KnownSymbol a2) =>

487− IsLabel a (Aliased (QualifiedAlias q') (a' ::: a')) where

487+ IsLabel a0 (Aliased (QualifiedAlias q) (a1 ::: a2)) where

488 fromLabel = QualifiedAlias `As` Alias

489

490renderQualifiedAlias