DSL: Add spaces after column names (fixes #129) (#132)

* add test for #129

* force space after column names (fixes #129)

snapshot-tests/anorm-sql/CompositeIdsTest/query2.sql

@@ -1,5 +1,5 @@
 with 
 personemailaddress0 as (
-  (select personemailaddress0 from "person"."emailaddress" personemailaddress0 where ((personemailaddress0).businessentityid, (personemailaddress0).emailaddressid) in (select unnest(?::int4[]), unnest(?::int4[])))
+  (select personemailaddress0 from "person"."emailaddress" personemailaddress0 where ((personemailaddress0).businessentityid , (personemailaddress0).emailaddressid ) in (select unnest(?::int4[]), unnest(?::int4[])))
 )
 select (personemailaddress0)."businessentityid",(personemailaddress0)."emailaddressid",(personemailaddress0)."emailaddress",(personemailaddress0)."rowguid",(personemailaddress0)."modifieddate"::text from personemailaddress0

snapshot-tests/anorm-sql/DSLTest/doubled.sql

@@ -1,6 +1,6 @@
 with 
 salessalesperson0 as (
-  (select salessalesperson0 from "sales"."salesperson" salessalesperson0 where ((salessalesperson0).rowguid = ?::uuid))
+  (select salessalesperson0 from "sales"."salesperson" salessalesperson0 where ((salessalesperson0).rowguid  = ?::uuid))
 ),
 humanresourcesemployee0 as (
   (select humanresourcesemployee0 from "humanresources"."employee" humanresourcesemployee0 )
@@ -9,7 +9,7 @@ join_cte5 as (
   select salessalesperson0, humanresourcesemployee0
   from salessalesperson0
   join humanresourcesemployee0
-  on ((salessalesperson0).businessentityid = (humanresourcesemployee0).businessentityid)
+  on ((salessalesperson0).businessentityid  = (humanresourcesemployee0).businessentityid )
 
 ),
 personperson0 as (
@@ -19,7 +19,7 @@ join_cte4 as (
   select salessalesperson0, humanresourcesemployee0, personperson0
   from join_cte5
   join personperson0
-  on ((humanresourcesemployee0).businessentityid = (personperson0).businessentityid)
+  on ((humanresourcesemployee0).businessentityid  = (personperson0).businessentityid )
 
 ),
 personbusinessentity0 as (
@@ -29,17 +29,17 @@ join_cte3 as (
   select salessalesperson0, humanresourcesemployee0, personperson0, personbusinessentity0
   from join_cte4
   join personbusinessentity0
-  on ((personperson0).businessentityid = (personbusinessentity0).businessentityid)
+  on ((personperson0).businessentityid  = (personbusinessentity0).businessentityid )
 
 ),
 personemailaddress0 as (
-  (select personemailaddress0 from "person"."emailaddress" personemailaddress0 order by (personemailaddress0).rowguid ASC )
+  (select personemailaddress0 from "person"."emailaddress" personemailaddress0 order by (personemailaddress0).rowguid  ASC )
 ),
 join_cte2 as (
   select salessalesperson0, humanresourcesemployee0, personperson0, personbusinessentity0, personemailaddress0
   from join_cte3
   join personemailaddress0
-  on ((personemailaddress0).businessentityid = (personbusinessentity0).businessentityid)
+  on ((personemailaddress0).businessentityid  = (personbusinessentity0).businessentityid )
 
 ),
 salessalesperson1 as (
@@ -49,11 +49,11 @@ join_cte1 as (
   select salessalesperson0, humanresourcesemployee0, personperson0, personbusinessentity0, personemailaddress0, salessalesperson1
   from join_cte2
   join salessalesperson1
-  on ((personemailaddress0).businessentityid = (salessalesperson1).businessentityid)
+  on ((personemailaddress0).businessentityid  = (salessalesperson1).businessentityid )
 
 ),
 salessalesperson2 as (
-  (select salessalesperson2 from "sales"."salesperson" salessalesperson2 where ((salessalesperson2).rowguid = ?::uuid))
+  (select salessalesperson2 from "sales"."salesperson" salessalesperson2 where ((salessalesperson2).rowguid  = ?::uuid))
 ),
 humanresourcesemployee1 as (
   (select humanresourcesemployee1 from "humanresources"."employee" humanresourcesemployee1 )
@@ -62,7 +62,7 @@ join_cte10 as (
   select salessalesperson2, humanresourcesemployee1
   from salessalesperson2
   join humanresourcesemployee1
-  on ((salessalesperson2).businessentityid = (humanresourcesemployee1).businessentityid)
+  on ((salessalesperson2).businessentityid  = (humanresourcesemployee1).businessentityid )
 
 ),
 personperson1 as (
@@ -72,7 +72,7 @@ join_cte9 as (
   select salessalesperson2, humanresourcesemployee1, personperson1
   from join_cte10
   join personperson1
-  on ((humanresourcesemployee1).businessentityid = (personperson1).businessentityid)
+  on ((humanresourcesemployee1).businessentityid  = (personperson1).businessentityid )
 
 ),
 personbusinessentity1 as (
@@ -82,17 +82,17 @@ join_cte8 as (
   select salessalesperson2, humanresourcesemployee1, personperson1, personbusinessentity1
   from join_cte9
   join personbusinessentity1
-  on ((personperson1).businessentityid = (personbusinessentity1).businessentityid)
+  on ((personperson1).businessentityid  = (personbusinessentity1).businessentityid )
 
 ),
 personemailaddress1 as (
-  (select personemailaddress1 from "person"."emailaddress" personemailaddress1 order by (personemailaddress1).rowguid ASC )
+  (select personemailaddress1 from "person"."emailaddress" personemailaddress1 order by (personemailaddress1).rowguid  ASC )
 ),
 join_cte7 as (
   select salessalesperson2, humanresourcesemployee1, personperson1, personbusinessentity1, personemailaddress1
   from join_cte8
   join personemailaddress1
-  on ((personemailaddress1).businessentityid = (personbusinessentity1).businessentityid)
+  on ((personemailaddress1).businessentityid  = (personbusinessentity1).businessentityid )
 
 ),
 salessalesperson3 as (
@@ -102,14 +102,14 @@ join_cte6 as (
   select salessalesperson2, humanresourcesemployee1, personperson1, personbusinessentity1, personemailaddress1, salessalesperson3
   from join_cte7
   join salessalesperson3
-  on ((personemailaddress1).businessentityid = (salessalesperson3).businessentityid)
+  on ((personemailaddress1).businessentityid  = (salessalesperson3).businessentityid )
 
 ),
 join_cte0 as (
   select salessalesperson0, humanresourcesemployee0, personperson0, personbusinessentity0, personemailaddress0, salessalesperson1, salessalesperson2, humanresourcesemployee1, personperson1, personbusinessentity1, personemailaddress1, salessalesperson3
   from join_cte1
   join join_cte6
-  on ((personemailaddress0).businessentityid = (personemailaddress1).businessentityid)
+  on ((personemailaddress0).businessentityid  = (personemailaddress1).businessentityid )
 
 )
 select (salessalesperson0)."businessentityid",(salessalesperson0)."territoryid",(salessalesperson0)."salesquota",(salessalesperson0)."bonus",(salessalesperson0)."commissionpct",(salessalesperson0)."salesytd",(salessalesperson0)."saleslastyear",(salessalesperson0)."rowguid",(salessalesperson0)."modifieddate"::text,(humanresourcesemployee0)."businessentityid",(humanresourcesemployee0)."nationalidnumber",(humanresourcesemployee0)."loginid",(humanresourcesemployee0)."jobtitle",(humanresourcesemployee0)."birthdate"::text,(humanresourcesemployee0)."maritalstatus",(humanresourcesemployee0)."gender",(humanresourcesemployee0)."hiredate"::text,(humanresourcesemployee0)."salariedflag",(humanresourcesemployee0)."vacationhours",(humanresourcesemployee0)."sickleavehours",(humanresourcesemployee0)."currentflag",(humanresourcesemployee0)."rowguid",(humanresourcesemployee0)."modifieddate"::text,(humanresourcesemployee0)."organizationnode",(personperson0)."businessentityid",(personperson0)."persontype",(personperson0)."namestyle",(personperson0)."title",(personperson0)."firstname",(personperson0)."middlename",(personperson0)."lastname",(personperson0)."suffix",(personperson0)."emailpromotion",(personperson0)."additionalcontactinfo",(personperson0)."demographics",(personperson0)."rowguid",(personperson0)."modifieddate"::text,(personbusinessentity0)."businessentityid",(personbusinessentity0)."rowguid",(personbusinessentity0)."modifieddate"::text,(personemailaddress0)."businessentityid",(personemailaddress0)."emailaddressid",(personemailaddress0)."emailaddress",(personemailaddress0)."rowguid",(personemailaddress0)."modifieddate"::text,(salessalesperson1)."businessentityid",(salessalesperson1)."territoryid",(salessalesperson1)."salesquota",(salessalesperson1)."bonus",(salessalesperson1)."commissionpct",(salessalesperson1)."salesytd",(salessalesperson1)."saleslastyear",(salessalesperson1)."rowguid",(salessalesperson1)."modifieddate"::text,(salessalesperson2)."businessentityid",(salessalesperson2)."territoryid",(salessalesperson2)."salesquota",(salessalesperson2)."bonus",(salessalesperson2)."commissionpct",(salessalesperson2)."salesytd",(salessalesperson2)."saleslastyear",(salessalesperson2)."rowguid",(salessalesperson2)."modifieddate"::text,(humanresourcesemployee1)."businessentityid",(humanresourcesemployee1)."nationalidnumber",(humanresourcesemployee1)."loginid",(humanresourcesemployee1)."jobtitle",(humanresourcesemployee1)."birthdate"::text,(humanresourcesemployee1)."maritalstatus",(humanresourcesemployee1)."gender",(humanresourcesemployee1)."hiredate"::text,(humanresourcesemployee1)."salariedflag",(humanresourcesemployee1)."vacationhours",(humanresourcesemployee1)."sickleavehours",(humanresourcesemployee1)."currentflag",(humanresourcesemployee1)."rowguid",(humanresourcesemployee1)."modifieddate"::text,(humanresourcesemployee1)."organizationnode",(personperson1)."businessentityid",(personperson1)."persontype",(personperson1)."namestyle",(personperson1)."title",(personperson1)."firstname",(personperson1)."middlename",(personperson1)."lastname",(personperson1)."suffix",(personperson1)."emailpromotion",(personperson1)."additionalcontactinfo",(personperson1)."demographics",(personperson1)."rowguid",(personperson1)."modifieddate"::text,(personbusinessentity1)."businessentityid",(personbusinessentity1)."rowguid",(personbusinessentity1)."modifieddate"::text,(personemailaddress1)."businessentityid",(personemailaddress1)."emailaddressid",(personemailaddress1)."emailaddress",(personemailaddress1)."rowguid",(personemailaddress1)."modifieddate"::text,(salessalesperson3)."businessentityid",(salessalesperson3)."territoryid",(salessalesperson3)."salesquota",(salessalesperson3)."bonus",(salessalesperson3)."commissionpct",(salessalesperson3)."salesytd",(salessalesperson3)."saleslastyear",(salessalesperson3)."rowguid",(salessalesperson3)."modifieddate"::text from join_cte0

snapshot-tests/anorm-sql/ProductTest/delete.sql

@@ -1 +1 @@
-delete from "production"."product" where coalesce((productid = ?::INTEGER), ?::BOOLEAN)
+delete from "production"."product" where coalesce((productid  = ?::INTEGER), ?::BOOLEAN)

snapshot-tests/anorm-sql/ProductTest/leftJoined.sql

@@ -9,7 +9,7 @@ left_join_cte0 as (
   select productionproduct0, productionproductmodel0
   from productionproduct0
   left join productionproductmodel0
-  on ((productionproduct0).productmodelid = (productionproductmodel0).productmodelid)
+  on ((productionproduct0).productmodelid  = (productionproductmodel0).productmodelid )
 
 )
 select (productionproduct0)."productid",(productionproduct0)."name",(productionproduct0)."productnumber",(productionproduct0)."makeflag",(productionproduct0)."finishedgoodsflag",(productionproduct0)."color",(productionproduct0)."safetystocklevel",(productionproduct0)."reorderpoint",(productionproduct0)."standardcost",(productionproduct0)."listprice",(productionproduct0)."size",(productionproduct0)."sizeunitmeasurecode",(productionproduct0)."weightunitmeasurecode",(productionproduct0)."weight",(productionproduct0)."daystomanufacture",(productionproduct0)."productline",(productionproduct0)."class",(productionproduct0)."style",(productionproduct0)."productsubcategoryid",(productionproduct0)."productmodelid",(productionproduct0)."sellstartdate"::text,(productionproduct0)."sellenddate"::text,(productionproduct0)."discontinueddate"::text,(productionproduct0)."rowguid",(productionproduct0)."modifieddate"::text,(productionproductmodel0)."productmodelid",(productionproductmodel0)."name",(productionproductmodel0)."catalogdescription",(productionproductmodel0)."instructions",(productionproductmodel0)."rowguid",(productionproductmodel0)."modifieddate"::text from left_join_cte0

snapshot-tests/anorm-sql/ProductTest/q.sql

@@ -1,15 +1,15 @@
 with 
 productionproduct0 as (
-  (select productionproduct0 from "production"."product" productionproduct0 where (((NOT ((productionproduct0).name LIKE ?::VARCHAR) AND NOT (((productionproduct0).name || (productionproduct0).color) LIKE ?::VARCHAR)) AND ((productionproduct0).daystomanufacture > ?::INTEGER)) AND ((productionproduct0).modifieddate < ?::timestamp)))
+  (select productionproduct0 from "production"."product" productionproduct0 where (((NOT ((productionproduct0).name  LIKE ?::VARCHAR) AND NOT (((productionproduct0).name  || (productionproduct0).color ) LIKE ?::VARCHAR)) AND ((productionproduct0).daystomanufacture  > ?::INTEGER)) AND ((productionproduct0).modifieddate  < ?::timestamp)))
 ),
 productionproductmodel0 as (
-  (select productionproductmodel0 from "production"."productmodel" productionproductmodel0 where ((productionproductmodel0).modifieddate < ?::timestamp))
+  (select productionproductmodel0 from "production"."productmodel" productionproductmodel0 where ((productionproductmodel0).modifieddate  < ?::timestamp))
 ),
 join_cte0 as (
   select productionproduct0, productionproductmodel0
   from productionproduct0
   join productionproductmodel0
-  on ((productionproduct0).productmodelid = (productionproductmodel0).productmodelid)
-  where NOT (productionproductmodel0).instructions IS NULL
+  on ((productionproduct0).productmodelid  = (productionproductmodel0).productmodelid )
+  where NOT (productionproductmodel0).instructions  IS NULL
 )
 select (productionproduct0)."productid",(productionproduct0)."name",(productionproduct0)."productnumber",(productionproduct0)."makeflag",(productionproduct0)."finishedgoodsflag",(productionproduct0)."color",(productionproduct0)."safetystocklevel",(productionproduct0)."reorderpoint",(productionproduct0)."standardcost",(productionproduct0)."listprice",(productionproduct0)."size",(productionproduct0)."sizeunitmeasurecode",(productionproduct0)."weightunitmeasurecode",(productionproduct0)."weight",(productionproduct0)."daystomanufacture",(productionproduct0)."productline",(productionproduct0)."class",(productionproduct0)."style",(productionproduct0)."productsubcategoryid",(productionproduct0)."productmodelid",(productionproduct0)."sellstartdate"::text,(productionproduct0)."sellenddate"::text,(productionproduct0)."discontinueddate"::text,(productionproduct0)."rowguid",(productionproduct0)."modifieddate"::text,(productionproductmodel0)."productmodelid",(productionproductmodel0)."name",(productionproductmodel0)."catalogdescription",(productionproductmodel0)."instructions",(productionproductmodel0)."rowguid",(productionproductmodel0)."modifieddate"::text from join_cte0

snapshot-tests/anorm-sql/ProductTest/q2.sql

@@ -1,25 +1,25 @@
 with 
 productionproduct0 as (
-  (select productionproduct0 from "production"."product" productionproduct0 where (((((productionproduct0).productid = ANY(?) AND (length((productionproduct0).name) > ?::INTEGER)) AND NOT (((productionproduct0).name || (productionproduct0).color) LIKE ?::VARCHAR)) AND (coalesce((productionproduct0).color, ?::VARCHAR) != ?::VARCHAR)) AND ((productionproduct0).modifieddate < ?::timestamp)))
+  (select productionproduct0 from "production"."product" productionproduct0 where (((((productionproduct0).productid  = ANY(?) AND (length((productionproduct0).name ) > ?::INTEGER)) AND NOT (((productionproduct0).name  || (productionproduct0).color ) LIKE ?::VARCHAR)) AND (coalesce((productionproduct0).color , ?::VARCHAR) != ?::VARCHAR)) AND ((productionproduct0).modifieddate  < ?::timestamp)))
 ),
 productionproductmodel0 as (
-  (select productionproductmodel0 from "production"."productmodel" productionproductmodel0 where (length((productionproductmodel0).name) > ?::INTEGER))
+  (select productionproductmodel0 from "production"."productmodel" productionproductmodel0 where (length((productionproductmodel0).name ) > ?::INTEGER))
 ),
 join_cte0 as (
   select productionproduct0, productionproductmodel0
   from productionproduct0
   join productionproductmodel0
-  on ((productionproduct0).productmodelid = (productionproductmodel0).productmodelid)
-  where ((productionproductmodel0).name != ?::VARCHAR)
+  on ((productionproduct0).productmodelid  = (productionproductmodel0).productmodelid )
+  where ((productionproductmodel0).name  != ?::VARCHAR)
 ),
 productionproductmodel1 as (
-  (select productionproductmodel1 from "production"."productmodel" productionproductmodel1 where (length((productionproductmodel1).name) > ?::INTEGER))
+  (select productionproductmodel1 from "production"."productmodel" productionproductmodel1 where (length((productionproductmodel1).name ) > ?::INTEGER))
 ),
 left_join_cte0 as (
   select productionproduct0, productionproductmodel0, productionproductmodel1
   from join_cte0
   left join productionproductmodel1
-  on (((productionproduct0).productmodelid = (productionproductmodel1).productmodelid) AND ?::BOOLEAN)
-  order by (productionproductmodel1).name ASC , (productionproduct0).color DESC NULLS FIRST
+  on (((productionproduct0).productmodelid  = (productionproductmodel1).productmodelid ) AND ?::BOOLEAN)
+  order by (productionproductmodel1).name  ASC , (productionproduct0).color  DESC NULLS FIRST
 )
 select (productionproduct0)."productid",(productionproduct0)."name",(productionproduct0)."productnumber",(productionproduct0)."makeflag",(productionproduct0)."finishedgoodsflag",(productionproduct0)."color",(productionproduct0)."safetystocklevel",(productionproduct0)."reorderpoint",(productionproduct0)."standardcost",(productionproduct0)."listprice",(productionproduct0)."size",(productionproduct0)."sizeunitmeasurecode",(productionproduct0)."weightunitmeasurecode",(productionproduct0)."weight",(productionproduct0)."daystomanufacture",(productionproduct0)."productline",(productionproduct0)."class",(productionproduct0)."style",(productionproduct0)."productsubcategoryid",(productionproduct0)."productmodelid",(productionproduct0)."sellstartdate"::text,(productionproduct0)."sellenddate"::text,(productionproduct0)."discontinueddate"::text,(productionproduct0)."rowguid",(productionproduct0)."modifieddate"::text,(productionproductmodel0)."productmodelid",(productionproductmodel0)."name",(productionproductmodel0)."catalogdescription",(productionproductmodel0)."instructions",(productionproductmodel0)."rowguid",(productionproductmodel0)."modifieddate"::text,(productionproductmodel1)."productmodelid",(productionproductmodel1)."name",(productionproductmodel1)."catalogdescription",(productionproductmodel1)."instructions",(productionproductmodel1)."rowguid",(productionproductmodel1)."modifieddate"::text from left_join_cte0