Merge branch 'main' into dependabot/go_modules/golang.org/x/crypto-0.…

…17.0
chnm · Jul 22, 2024 · 1c399e9 · 1c399e9
2 parents 3cc3d79 + 1af9520
commit 1c399e9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v23.0.1+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
@@ -43,7 +43,7 @@ require (
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

diff --git a/go.sum b/go.sum
@@ -18,8 +18,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v23.0.1+incompatible h1:vjgvJZxprTTE1A37nm+CLNAdwu6xZekyoiVlUZEINcY=
-github.com/docker/docker v23.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -207,8 +207,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/populated-places.go b/populated-places.go
@@ -45,7 +45,7 @@ func (s *Server) CountiesInState() http.HandlerFunc {
 
 	query := `
 		SELECT DISTINCT county_ahcb, county
-		FROM popplaces_1926
+		FROM relcensus.popplaces_1926
 		WHERE state = $1
 		ORDER BY county;
 		`
@@ -88,7 +88,7 @@ func (s *Server) PlacesInCounty() http.HandlerFunc {
 
 	query := `
 		SELECT place_id, place, map_name
-		FROM popplaces_1926
+		FROM relcensus.popplaces_1926
 		WHERE county_ahcb = $1
 		ORDER BY place;
 		`
@@ -131,7 +131,7 @@ func (s *Server) Place() http.HandlerFunc {
 
 	query := `
 		SELECT place_id, place, map_name, county, county_ahcb, state
-		FROM popplaces_1926
+		FROM relcensus.popplaces_1926
 		WHERE place_id = $1
 		`
 

diff --git a/relecensus-cities.go b/relecensus-cities.go
@@ -38,7 +38,7 @@ func (s *Server) RelCensusCityMembershipHandler() http.HandlerFunc {
 		ST_X(c.geometry) AS lon, ST_Y(c.geometry) AS lat
 		FROM relcensus.membership_city m
 		LEFT JOIN relcensus.cities_25K c ON m.city = c.city AND m.state = c.state
-		LEFT JOIN popplaces_1926 p ON c.place_id = p.place_id
+		LEFT JOIN relcensus.popplaces_1926 p ON c.place_id = p.place_id
 		WHERE year = $1 AND denomination = $2
 		ORDER BY state, city;
 	`
@@ -68,7 +68,7 @@ func (s *Server) RelCensusCityMembershipHandler() http.HandlerFunc {
 	GROUP BY m.year, d.family_relec, m.city, m.state
 	) d
 	LEFT JOIN relcensus.cities_25k c ON d.city = c.city AND d.state = c.state
-	LEFT JOIN popplaces_1926 p ON c.place_id = p.place_id
+	LEFT JOIN relcensus.popplaces_1926 p ON c.place_id = p.place_id
 	ORDER BY c.state, c.city;
 	`
 
@@ -95,7 +95,7 @@ func (s *Server) RelCensusCityMembershipHandler() http.HandlerFunc {
 	GROUP BY m.year, m.city, m.state
 	) d
 	LEFT JOIN relcensus.cities_25k c ON d.city = c.city AND d.state = c.state
-	LEFT JOIN popplaces_1926 p ON c.place_id = p.place_id
+	LEFT JOIN relcensus.popplaces_1926 p ON c.place_id = p.place_id
 	ORDER BY c.state, c.city;
 	`