Yet more progress!

resources/sql/queries.auto.sql

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 --	File queries.sql 
 --	
---	autogenerated by adl.to-hugsql-queries at 2018-06-29T22:21:53.869Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-06-30T11:35:59.388Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
@@ -282,6 +282,8 @@ SELECT * FROM canvassers
 WHERE canvassers.id = :id
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -291,6 +293,8 @@ SELECT * FROM canvassers
 WHERE canvassers.username = :username
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -420,6 +424,8 @@ SELECT DISTINCT * FROM lv_authorities
 SELECT DISTINCT * FROM lv_canvassers
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 --~ (if (:offset params) "OFFSET :offset ")
@@ -433,6 +439,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.address_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -444,6 +452,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.authority_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -455,6 +465,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.elector_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -466,6 +478,8 @@ WHERE canvassers.id = ln_canvassers_roles.canvasser_id
 	AND ln_canvassers_roles.role_id = :id
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -783,6 +797,8 @@ WHERE false
 	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 --~ (if (:offset params) "OFFSET :offset ")

resources/sql/youyesyet.postgres.sql

@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180629T163619.639Z 
+--	(https://github.com/simon-brooke/adl) at 20180630T113600.308Z 
 --	
 --	
 --	    A web-app intended to be used by canvassers campaigning for a 
@@ -576,7 +576,7 @@ GRANT SELECT ON lv_electors TO admin,
 CREATE VIEW lv_followupactions AS
 SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
 	followupactions.request_id,
-	canvassers.username ||', '|| canvassers.fullname ||', '|| canvassers.email AS actor_expanded,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS actor_expanded,
 	followupactions.actor,
 	followupactions.date,
 	followupactions.notes,
@@ -741,7 +741,7 @@ GRANT SELECT ON lv_teams TO admin,
 CREATE VIEW lv_visits AS
 SELECT addresses.address ||', '|| addresses.postcode AS address_id_expanded,
 	visits.address_id,
-	canvassers.username ||', '|| canvassers.fullname ||', '|| canvassers.email AS canvasser_id_expanded,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS canvasser_id_expanded,
 	visits.canvasser_id,
 	visits.date,
 	visits.id