git.iko.soy/squeal
on dev help sign in
omg that looks so nice
commit8d2df16db229374a3eb6980b7a05085f3d850779 authorEitan Chatav <eitan.chatav@gmail.com> dateSun 8 Apr 2018, 22:00 (9 years ago) parent8ca416a
6 files changed+18−16
compare with dev
unifiedsplit
README.md+3−3 squeal-postgresql/exe/Example.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+4−4 squeal-postgresql/src/Squeal/PostgreSQL/Migration.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+2
README.md+3−3
@@ -128,13 +128,13 @@ let
128128 createTable #users
129129 ( serial `As` #id :*
130130 (text & notNull) `As` #name :* Nil )
131− ( primaryKey (#id :* Nil) `As` #pk_users :* Nil ) >>>
131+ ( primaryKey #id `As` #pk_users :* Nil ) >>>
132132 createTable #emails
133133 ( serial `As` #id :*
134134 (int & notNull) `As` #user_id :*
135135 text `As` #email :* Nil )
136− ( primaryKey (#id :* Nil) `As` #pk_emails :*
137− foreignKey (#user_id :* Nil) #users (#id :* Nil)
136+ ( primaryKey #id `As` #pk_emails :*
137+ foreignKey #user_id #users #id
138138 OnDeleteCascade OnUpdateCascade `As` #fk_user_id :* Nil )
139139:}
140140```
squeal-postgresql/exe/Example.hs+3−3
@@ -47,14 +47,14 @@ setup =
4747 ( serial `As` #id :*
4848 (text & notNull) `As` #name :*
4949 (vararray int2 & notNull) `As` #vec :* Nil )
50− ( primaryKey (#id :* Nil) `As` #pk_users :* Nil )
50+ ( primaryKey #id `As` #pk_users :* Nil )
5151 >>>
5252 createTable #emails
5353 ( serial `As` #id :*
5454 (int & notNull) `As` #user_id :*
5555 text `As` #email :* Nil )
56− ( primaryKey (#id :* Nil) `As` #pk_emails :*
57− foreignKey (#user_id :* Nil) #users (#id :* Nil)
56+ ( primaryKey #id `As` #pk_emails :*
57+ foreignKey #user_id #users #id
5858 OnDeleteCascade OnUpdateCascade `As` #fk_user_id :* Nil )
5959
6060teardown :: Definition Schema '[]
squeal-postgresql/src/Squeal/PostgreSQL.hs+3−3
@@ -67,13 +67,13 @@
6767-- createTable #users
6868-- ( serial `As` #id :*
6969-- (text & notNull) `As` #name :* Nil )
70−-- ( primaryKey (#id :* Nil) `As` #pk_users :* Nil ) >>>
70+-- ( primaryKey #id `As` #pk_users :* Nil ) >>>
7171-- createTable #emails
7272-- ( serial `As` #id :*
7373-- (int & notNull) `As` #user_id :*
7474-- text `As` #email :* Nil )
75−-- ( primaryKey (#id :* Nil) `As` #pk_emails :*
76−-- foreignKey (#user_id :* Nil) #users (#id :* Nil)
75+-- ( primaryKey #id `As` #pk_emails :*
76+-- foreignKey #user_id #users #id
7777-- OnDeleteCascade OnUpdateCascade `As` #fk_user_id :* Nil )
7878-- :}
7979--
squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+4−4
@@ -279,7 +279,7 @@ unique columns = UnsafeTableConstraintExpression $
279279-- definition = createTable #tab
280280-- ( serial `As` #id :*
281281-- (text & notNull) `As` #name :* Nil )
282−-- ( primaryKey (#id :* Nil) `As` #pk_id :* Nil )
282+-- ( primaryKey #id `As` #pk_id :* Nil )
283283-- :}
284284--
285285-- >>> renderDefinition definition
@@ -322,13 +322,13 @@ primaryKey columns = UnsafeTableConstraintExpression $
322322-- createTable #users
323323-- ( serial `As` #id :*
324324-- (text & notNull) `As` #name :* Nil )
325−-- ( primaryKey (#id :* Nil) `As` #pk_users :* Nil ) >>>
325+-- ( primaryKey #id `As` #pk_users :* Nil ) >>>
326326-- createTable #emails
327327-- ( serial `As` #id :*
328328-- (int & notNull) `As` #user_id :*
329329-- text `As` #email :* Nil )
330−-- ( primaryKey (#id :* Nil) `As` #pk_emails :*
331−-- foreignKey (#user_id :* Nil) #users (#id :* Nil)
330+-- ( primaryKey #id `As` #pk_emails :*
331+-- foreignKey #user_id #users #id
332332-- OnDeleteCascade OnUpdateCascade `As` #fk_user_id :* Nil )
333333-- in renderDefinition setup
334334-- :}
squeal-postgresql/src/Squeal/PostgreSQL/Migration.hs+3−3
@@ -38,7 +38,7 @@ let
3838 createTable #users
3939 ( serial `As` #id :*
4040 (text & notNull) `As` #name :* Nil )
41− ( primaryKey (#id :* Nil) `As` #pk_users :* Nil )
41+ ( primaryKey #id `As` #pk_users :* Nil )
4242 , down = void . define $ dropTable #users
4343 }
4444:}
@@ -54,8 +54,8 @@ let
5454 ( serial `As` #id :*
5555 (int & notNull) `As` #user_id :*
5656 text `As` #email :* Nil )
57− ( primaryKey (#id :* Nil) `As` #pk_emails :*
58− foreignKey (#user_id :* Nil) #users (#id :* Nil)
57+ ( primaryKey #id `As` #pk_emails :*
58+ foreignKey #user_id #users #id
5959 OnDeleteCascade OnUpdateCascade `As` #fk_user_id :* Nil )
6060 , down = void . define $ dropTable #emails
6161 }
squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+2
@@ -362,6 +362,8 @@ data Alias (alias :: Symbol) = Alias
362362 deriving (Eq,GHC.Generic,Ord,Show,NFData)
363363instance alias1 ~ alias2 => IsLabel alias1 (Alias alias2) where
364364 fromLabel = Alias
365+instance aliases ~ '[alias] => IsLabel alias (SOP.NP Alias aliases) where
366+ fromLabel = fromLabel SOP.:* SOP.Nil
365367
366368-- | >>> renderAlias #jimbob
367369-- "\"jimbob\""