git.iko.soy/rowtype-yoga/purescript-yoga-postgres
on main help sign in
Add string literal handling to JOIN condition parser
c4bbae5Mark
src/Yoga/Postgres/Schema.purs+33−4
compare with main
unifiedsplit
@@ -1314,6 +1314,7 @@ else instance (FlushWhereWord acc currentType tables paramsIn currentType' param
1314else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo ":" tail acc currentType tables paramsIn paramsOut
1314else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo ":" tail acc currentType tables paramsIn paramsOut
1315else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo "~" tail acc currentType tables paramsIn paramsOut
1315else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo "~" tail acc currentType tables paramsIn paramsOut
1316else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo "#" tail acc currentType tables paramsIn paramsOut
1316else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo "#" tail acc currentType tables paramsIn paramsOut
1317+else instance (FlushWhereWord acc currentType tables paramsIn currentType' paramsOut', ParseWhereContinue tail currentType' tables paramsOut' paramsOut) => ParseWhereGo "," tail acc currentType tables paramsIn paramsOut
1317
1318
1318-- End of string: flush final word
1319-- End of string: flush final word
1319else instance
1320else instance
@@ -1431,7 +1432,9 @@ else instance
1431class FlushWhereWordA :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1432class FlushWhereWordA :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1432class FlushWhereWordA word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1433class FlushWhereWordA word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1433
1434
1435+instance FlushWhereWordA "ABS" currentType tables paramsIn currentType paramsIn
1436+else instance FlushWhereWordA "abs" currentType tables paramsIn currentType paramsIn
1434−instance FlushWhereWordA "ANY" currentType tables paramsIn (Array currentType) paramsIn
1437+else instance FlushWhereWordA "ANY" currentType tables paramsIn (Array currentType) paramsIn
1435else instance FlushWhereWordA "any" currentType tables paramsIn (Array currentType) paramsIn
1438else instance FlushWhereWordA "any" currentType tables paramsIn (Array currentType) paramsIn
1436else instance FlushWhereWordA "ALL" currentType tables paramsIn (Array currentType) paramsIn
1439else instance FlushWhereWordA "ALL" currentType tables paramsIn (Array currentType) paramsIn
1437else instance FlushWhereWordA "all" currentType tables paramsIn (Array currentType) paramsIn
1440else instance FlushWhereWordA "all" currentType tables paramsIn (Array currentType) paramsIn
@@ -1467,8 +1470,18 @@ class FlushWhereWordC word currentType tables paramsIn currentTypeOut paramsOut
1467
1470
1468instance FlushWhereWordC "CAST" currentType tables paramsIn currentType paramsIn
1471instance FlushWhereWordC "CAST" currentType tables paramsIn currentType paramsIn
1469else instance FlushWhereWordC "cast" currentType tables paramsIn currentType paramsIn
1472else instance FlushWhereWordC "cast" currentType tables paramsIn currentType paramsIn
1473+else instance FlushWhereWordC "CEIL" currentType tables paramsIn currentType paramsIn
1474+else instance FlushWhereWordC "ceil" currentType tables paramsIn currentType paramsIn
1475+else instance FlushWhereWordC "COALESCE" currentType tables paramsIn currentType paramsIn
1476+else instance FlushWhereWordC "coalesce" currentType tables paramsIn currentType paramsIn
1477+else instance FlushWhereWordC "CONCAT" currentType tables paramsIn currentType paramsIn
1478+else instance FlushWhereWordC "concat" currentType tables paramsIn currentType paramsIn
1470else instance FlushWhereWordC "COUNT" currentType tables paramsIn Int paramsIn
1479else instance FlushWhereWordC "COUNT" currentType tables paramsIn Int paramsIn
1471else instance FlushWhereWordC "count" currentType tables paramsIn Int paramsIn
1480else instance FlushWhereWordC "count" currentType tables paramsIn Int paramsIn
1481+else instance FlushWhereWordC "CURRENT_DATE" currentType tables paramsIn currentType paramsIn
1482+else instance FlushWhereWordC "current_date" currentType tables paramsIn currentType paramsIn
1483+else instance FlushWhereWordC "CURRENT_TIMESTAMP" currentType tables paramsIn currentType paramsIn
1484+else instance FlushWhereWordC "current_timestamp" currentType tables paramsIn currentType paramsIn
1472else instance
1485else instance
1473 ( ResolveColumn word tables entry
1486 ( ResolveColumn word tables entry
1474 , ExtractType entry typ
1487 , ExtractType entry typ
@@ -1504,6 +1517,8 @@ class FlushWhereWordF word currentType tables paramsIn currentTypeOut paramsOut
1504
1517
1505instance FlushWhereWordF "FALSE" currentType tables paramsIn currentType paramsIn
1518instance FlushWhereWordF "FALSE" currentType tables paramsIn currentType paramsIn
1506else instance FlushWhereWordF "false" currentType tables paramsIn currentType paramsIn
1519else instance FlushWhereWordF "false" currentType tables paramsIn currentType paramsIn
1520+else instance FlushWhereWordF "FLOOR" currentType tables paramsIn currentType paramsIn
1521+else instance FlushWhereWordF "floor" currentType tables paramsIn currentType paramsIn
1507else instance
1522else instance
1508 ( ResolveColumn word tables entry
1523 ( ResolveColumn word tables entry
1509 , ExtractType entry typ
1524 , ExtractType entry typ
@@ -1542,8 +1557,14 @@ else instance
1542class FlushWhereWordL :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1557class FlushWhereWordL :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1543class FlushWhereWordL word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1558class FlushWhereWordL word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1544
1559
1560+instance FlushWhereWordL "LEAST" currentType tables paramsIn currentType paramsIn
1561+else instance FlushWhereWordL "least" currentType tables paramsIn currentType paramsIn
1562+else instance FlushWhereWordL "LENGTH" currentType tables paramsIn Int paramsIn
1563+else instance FlushWhereWordL "length" currentType tables paramsIn Int paramsIn
1545−instance FlushWhereWordL "LIKE" currentType tables paramsIn currentType paramsIn
1564+else instance FlushWhereWordL "LIKE" currentType tables paramsIn currentType paramsIn
1546else instance FlushWhereWordL "like" currentType tables paramsIn currentType paramsIn
1565else instance FlushWhereWordL "like" currentType tables paramsIn currentType paramsIn
1566+else instance FlushWhereWordL "LOWER" currentType tables paramsIn String paramsIn
1567+else instance FlushWhereWordL "lower" currentType tables paramsIn String paramsIn
1547else instance
1568else instance
1548 ( ResolveColumn word tables entry
1569 ( ResolveColumn word tables entry
1549 , ExtractType entry typ
1570 , ExtractType entry typ
@@ -1570,8 +1591,12 @@ class FlushWhereWordN word currentType tables paramsIn currentTypeOut paramsOut
1570
1591
1571instance FlushWhereWordN "NOT" currentType tables paramsIn currentType paramsIn -- unreachable (caught by FlushWhereWord directly) but included for self-containedness
1592instance FlushWhereWordN "NOT" currentType tables paramsIn currentType paramsIn -- unreachable (caught by FlushWhereWord directly) but included for self-containedness
1572else instance FlushWhereWordN "not" currentType tables paramsIn currentType paramsIn
1593else instance FlushWhereWordN "not" currentType tables paramsIn currentType paramsIn
1594+else instance FlushWhereWordN "NOW" currentType tables paramsIn currentType paramsIn
1595+else instance FlushWhereWordN "now" currentType tables paramsIn currentType paramsIn
1573else instance FlushWhereWordN "NULL" currentType tables paramsIn currentType paramsIn
1596else instance FlushWhereWordN "NULL" currentType tables paramsIn currentType paramsIn
1574else instance FlushWhereWordN "null" currentType tables paramsIn currentType paramsIn
1597else instance FlushWhereWordN "null" currentType tables paramsIn currentType paramsIn
1598+else instance FlushWhereWordN "NULLIF" currentType tables paramsIn currentType paramsIn
1599+else instance FlushWhereWordN "nullif" currentType tables paramsIn currentType paramsIn
1575else instance
1600else instance
1576 ( ResolveColumn word tables entry
1601 ( ResolveColumn word tables entry
1577 , ExtractType entry typ
1602 , ExtractType entry typ
@@ -1596,7 +1621,9 @@ else instance
1596class FlushWhereWordT :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1621class FlushWhereWordT :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1597class FlushWhereWordT word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1622class FlushWhereWordT word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1598
1623
1624+instance FlushWhereWordT "TRIM" currentType tables paramsIn String paramsIn
1625+else instance FlushWhereWordT "trim" currentType tables paramsIn String paramsIn
1599−instance FlushWhereWordT "TRUE" currentType tables paramsIn currentType paramsIn
1626+else instance FlushWhereWordT "TRUE" currentType tables paramsIn currentType paramsIn
1600else instance FlushWhereWordT "true" currentType tables paramsIn currentType paramsIn
1627else instance FlushWhereWordT "true" currentType tables paramsIn currentType paramsIn
1601else instance FlushWhereWordT "text" currentType tables paramsIn currentType paramsIn
1628else instance FlushWhereWordT "text" currentType tables paramsIn currentType paramsIn
1602else instance FlushWhereWordT "timestamptz" currentType tables paramsIn currentType paramsIn
1629else instance FlushWhereWordT "timestamptz" currentType tables paramsIn currentType paramsIn
@@ -1611,7 +1638,9 @@ else instance
1611class FlushWhereWordU :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1638class FlushWhereWordU :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1612class FlushWhereWordU word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1639class FlushWhereWordU word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1613
1640
1641+instance FlushWhereWordU "UPPER" currentType tables paramsIn String paramsIn
1642+else instance FlushWhereWordU "upper" currentType tables paramsIn String paramsIn
1614−instance FlushWhereWordU "uuid" currentType tables paramsIn currentType paramsIn
1643+else instance FlushWhereWordU "uuid" currentType tables paramsIn currentType paramsIn
1615else instance
1644else instance
1616 ( ResolveColumn word tables entry
1645 ( ResolveColumn word tables entry
1617 , ExtractType entry typ
1646 , ExtractType entry typ