git.iko.soy/squeal
on dev help sign in
fix tests
d01eae4Eitan Chatav
squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+25−25
compare with dev
unifiedsplit
@@ -511,8 +511,8 @@ newtype AlterTable
511-- >>> :{
511-- >>> :{
512-- let
512-- let
513-- definition :: Definition
513-- definition :: Definition
514−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
514+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
515−-- '["tab" ::: '["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
515+-- '["tab" ::: 'Table ('["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
516-- definition = alterTable #tab (addConstraint #positive (check (#col :* Nil) (#col .> 0)))
516-- definition = alterTable #tab (addConstraint #positive (check (#col :* Nil) (#col .> 0)))
517-- in renderDefinition definition
517-- in renderDefinition definition
518-- :}
518-- :}
@@ -535,8 +535,8 @@ addConstraint alias constraint = UnsafeAlterTable $
535-- >>> :{
535-- >>> :{
536-- let
536-- let
537-- definition :: Definition
537-- definition :: Definition
538−-- '["tab" ::: '["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
538+-- '["tab" ::: 'Table ('["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
539−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
539+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
540-- definition = alterTable #tab (dropConstraint #positive)
540-- definition = alterTable #tab (dropConstraint #positive)
541-- in renderDefinition definition
541-- in renderDefinition definition
542-- :}
542-- :}
@@ -560,10 +560,10 @@ class AddColumn ty where
560 -- >>> :{
560 -- >>> :{
561 -- let
561 -- let
562 -- definition :: Definition
562 -- definition :: Definition
563− -- '["tab" ::: '[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4]]
563+ -- '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]
564− -- '["tab" ::: '[] :=>
564+ -- '["tab" ::: 'Table ('[] :=>
565 -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
565 -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
566− -- , "col2" ::: 'Def :=> 'Null 'PGtext ]]
566+ -- , "col2" ::: 'Def :=> 'Null 'PGtext ])]
567 -- definition = alterTable #tab (addColumn #col2 (text & default_ "foo"))
567 -- definition = alterTable #tab (addColumn #col2 (text & default_ "foo"))
568 -- in renderDefinition definition
568 -- in renderDefinition definition
569 -- :}
569 -- :}
@@ -572,10 +572,10 @@ class AddColumn ty where
572 -- >>> :{
572 -- >>> :{
573 -- let
573 -- let
574 -- definition :: Definition
574 -- definition :: Definition
575− -- '["tab" ::: '[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4]]
575+ -- '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]
576− -- '["tab" ::: '[] :=>
576+ -- '["tab" ::: 'Table ('[] :=>
577 -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
577 -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
578− -- , "col2" ::: 'NoDef :=> 'Null 'PGtext ]]
578+ -- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]
579 -- definition = alterTable #tab (addColumn #col2 text)
579 -- definition = alterTable #tab (addColumn #col2 text)
580 -- in renderDefinition definition
580 -- in renderDefinition definition
581 -- :}
581 -- :}
@@ -601,10 +601,10 @@ instance {-# OVERLAPPABLE #-} AddColumn ('NoDef :=> 'Null ty)
601-- >>> :{
601-- >>> :{
602-- let
602-- let
603-- definition :: Definition
603-- definition :: Definition
604−-- '["tab" ::: '[] :=>
604+-- '["tab" ::: 'Table ('[] :=>
605-- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
605-- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
606−-- , "col2" ::: 'NoDef :=> 'Null 'PGtext ]]
606+-- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]
607−-- '["tab" ::: '[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4]]
607+-- '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]
608-- definition = alterTable #tab (dropColumn #col2)
608-- definition = alterTable #tab (dropColumn #col2)
609-- in renderDefinition definition
609-- in renderDefinition definition
610-- :}
610-- :}
@@ -624,8 +624,8 @@ dropColumn column = UnsafeAlterTable $
624-- >>> :{
624-- >>> :{
625-- let
625-- let
626-- definition :: Definition
626-- definition :: Definition
627−-- '["tab" ::: '[] :=> '["foo" ::: 'NoDef :=> 'Null 'PGint4]]
627+-- '["tab" ::: 'Table ('[] :=> '["foo" ::: 'NoDef :=> 'Null 'PGint4])]
628−-- '["tab" ::: '[] :=> '["bar" ::: 'NoDef :=> 'Null 'PGint4]]
628+-- '["tab" ::: 'Table ('[] :=> '["bar" ::: 'NoDef :=> 'Null 'PGint4])]
629-- definition = alterTable #tab (renameColumn #foo #bar)
629-- definition = alterTable #tab (renameColumn #foo #bar)
630-- in renderDefinition definition
630-- in renderDefinition definition
631-- :}
631-- :}
@@ -667,8 +667,8 @@ newtype AlterColumn (ty0 :: ColumnType) (ty1 :: ColumnType) =
667-- >>> :{
667-- >>> :{
668-- let
668-- let
669-- definition :: Definition
669-- definition :: Definition
670−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4]]
670+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]
671−-- '["tab" ::: '[] :=> '["col" ::: 'Def :=> 'Null 'PGint4]]
671+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]
672-- definition = alterTable #tab (alterColumn #col (setDefault 5))
672-- definition = alterTable #tab (alterColumn #col (setDefault 5))
673-- in renderDefinition definition
673-- in renderDefinition definition
674-- :}
674-- :}
@@ -684,8 +684,8 @@ setDefault expression = UnsafeAlterColumn $
684-- >>> :{
684-- >>> :{
685-- let
685-- let
686-- definition :: Definition
686-- definition :: Definition
687−-- '["tab" ::: '[] :=> '["col" ::: 'Def :=> 'Null 'PGint4]]
687+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]
688−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4]]
688+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]
689-- definition = alterTable #tab (alterColumn #col dropDefault)
689-- definition = alterTable #tab (alterColumn #col dropDefault)
690-- in renderDefinition definition
690-- in renderDefinition definition
691-- :}
691-- :}
@@ -700,8 +700,8 @@ dropDefault = UnsafeAlterColumn $ "DROP DEFAULT"
700-- >>> :{
700-- >>> :{
701-- let
701-- let
702-- definition :: Definition
702-- definition :: Definition
703−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4]]
703+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]
704−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
704+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
705-- definition = alterTable #tab (alterColumn #col setNotNull)
705-- definition = alterTable #tab (alterColumn #col setNotNull)
706-- in renderDefinition definition
706-- in renderDefinition definition
707-- :}
707-- :}
@@ -715,8 +715,8 @@ setNotNull = UnsafeAlterColumn $ "SET NOT NULL"
715-- >>> :{
715-- >>> :{
716-- let
716-- let
717-- definition :: Definition
717-- definition :: Definition
718−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
718+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
719−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4]]
719+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]
720-- definition = alterTable #tab (alterColumn #col dropNotNull)
720-- definition = alterTable #tab (alterColumn #col dropNotNull)
721-- in renderDefinition definition
721-- in renderDefinition definition
722-- :}
722-- :}
@@ -732,8 +732,8 @@ dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"
732-- >>> :{
732-- >>> :{
733-- let
733-- let
734-- definition :: Definition
734-- definition :: Definition
735−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4]]
735+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]
736−-- '["tab" ::: '[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGnumeric]]
736+-- '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGnumeric])]
737-- definition =
737-- definition =
738-- alterTable #tab (alterColumn #col (alterType (numeric & notNull)))
738-- alterTable #tab (alterColumn #col (alterType (numeric & notNull)))
739-- in renderDefinition definition
739-- in renderDefinition definition