Resolve country code ambigious selection

internal/database/actions.go

@@ -23,12 +23,14 @@ func ListMeasurements(sess sqlbuilder.Database, resultID int64) ([]MeasurementUR
 		"measurements.start_time as measurement_start_time",
 		"measurements.runtime as measurement_runtime",
 		"networks.id as network_id",
+		"networks.country_code as network_country_code",
 		"results.id as result_id",
 		"results.start_time as result_start_time",
 		"results.is_done as result_is_done",
 		"results.runtime as result_runtime",
 		"results.test_group_name as test_group_name",
 		"urls.id as url_id",
+		"urls.country_code as url_country_code",
 		db.Raw("networks.*"),
 		db.Raw("urls.*"),
 		db.Raw("measurements.*"),

internal/database/models.go

@@ -26,14 +26,19 @@ type MeasurementURLNetwork struct {
 	MeasurementIsDone    bool      `db:"measurement_is_done"`
 	MeasurementRuntime   float64   `db:"measurement_runtime"`
 	MsmtTblID            int64     `db:"msmt_tbl_id"`
-	Network              `db:",inline"`
-	NetworkID            int64 `db:"network_id"`
-	Result               `db:",inline"`
-	ResultID             int64     `db:"result_id"`
-	ResultRuntime        float64   `db:"result_runtime"`
-	ResultStartTime      time.Time `db:"result_start_time"`
-	ResultIsDone         bool      `db:"result_is_done"`
-	URL                  `db:",inline"`
+
+	Network            `db:",inline"`
+	NetworkID          int64  `db:"network_id"`
+	NetworkCountryCode string `db:"network_country_code"`
+
+	Result          `db:",inline"`
+	ResultID        int64     `db:"result_id"`
+	ResultRuntime   float64   `db:"result_runtime"`
+	ResultStartTime time.Time `db:"result_start_time"`
+	ResultIsDone    bool      `db:"result_is_done"`
+
+	URL            `db:",inline"`
+	URLCountryCode sql.NullString `db:"url_country_code"`
 }
 
 // Network represents a network tested by the user