Commitb19ad76

authored

feat(bigquery): enable use of GEOGRAPHY query params (#2158)

* feat(bigquery): enable use of GEOGRAPHY query params

1 parent970135b commitb19ad76Copy full SHA for b19ad76

File tree

+40

-0

lines changed

+40

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,11 @@ public static QueryParameterValue string(String value) {`
`258`	`258`	`returnof(value,StandardSQLTypeName.STRING);`
`259`	`259`	`}`
`260`	`260`
	`261`	`+/** Creates a {@code QueryParameterValue} object with a type of GEOGRAPHY. */`
	`262`	`+publicstaticQueryParameterValuegeography(Stringvalue) {`
	`263`	`+returnof(value,StandardSQLTypeName.GEOGRAPHY);`
	`264`	`+ }`
	`265`	`+`
`261`	`266`	`/**`
`262`	`267`	`* Creates a {@code QueryParameterValue} object with a type of JSON. Currently, this is only`
`263`	`268`	`* supported in INSERT, not in query as a filter`
`@@ -369,6 +374,8 @@ private static <T> StandardSQLTypeName classToType(Class<T> type) {`
`369`	`374`	`returnStandardSQLTypeName.BOOL;`
`370`	`375`	`}elseif (String.class.isAssignableFrom(type)) {`
`371`	`376`	`returnStandardSQLTypeName.STRING;`
	`377`	`+ }elseif (String.class.isAssignableFrom(type)) {`
	`378`	`+returnStandardSQLTypeName.GEOGRAPHY;`
`372`	`379`	`}elseif (Integer.class.isAssignableFrom(type)) {`
`373`	`380`	`returnStandardSQLTypeName.INT64;`
`374`	`381`	`}elseif (Long.class.isAssignableFrom(type)) {`
`@@ -422,6 +429,8 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)`
`422`	`429`	`break;`
`423`	`430`	`caseSTRING:`
`424`	`431`	`returnvalue.toString();`
	`432`	`+caseGEOGRAPHY:`
	`433`	`+returnvalue.toString();`
`425`	`434`	`caseJSON:`
`426`	`435`	`if (valueinstanceofString \|\|valueinstanceofJsonObject)returnvalue.toString();`
`427`	`436`	`caseINTERVAL:`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,15 @@ public void testString() {`
`196`	`196`	`assertThat(value.getArrayValues()).isNull();`
`197`	`197`	`}`
`198`	`198`
	`199`	`+@Test`
	`200`	`+publicvoidtestGeography() {`
	`201`	`+QueryParameterValuevalue =QueryParameterValue.geography("POINT(-122.350220 47.649154)");`
	`202`	`+assertThat(value.getValue()).isEqualTo("POINT(-122.350220 47.649154)");`
	`203`	`+assertThat(value.getType()).isEqualTo(StandardSQLTypeName.GEOGRAPHY);`
	`204`	`+assertThat(value.getArrayType()).isNull();`
	`205`	`+assertThat(value.getArrayValues()).isNull();`
	`206`	`+ }`
	`207`	`+`
`199`	`208`	`@Test`
`200`	`209`	`publicvoidtestJson() {`
`201`	`210`	`QueryParameterValuevalue =`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3655,6 +3655,28 @@ public void testBytesParameter() throws Exception {`
`3655`	`3655`	`assertEquals(1,rowCount);`
`3656`	`3656`	`}`
`3657`	`3657`
	`3658`	`+@Test`
	`3659`	`+publicvoidtestGeographyParameter()throwsException {`
	`3660`	`+// Issues a simple ST_DISTANCE using two geopoints, one being a named geography parameter.`
	`3661`	`+Stringquery =`
	`3662`	`+"SELECT ST_DISTANCE(ST_GEOGFROMTEXT(\"POINT(-122.335503 47.625536)\"), @geo) < 3000 as within3k";`
	`3663`	`+QueryParameterValuegeoParameterValue =`
	`3664`	`+QueryParameterValue.geography("POINT(-122.3509153 47.6495389)");`
	`3665`	`+QueryJobConfigurationconfig =`
	`3666`	`+QueryJobConfiguration.newBuilder(query)`
	`3667`	`+ .setDefaultDataset(DatasetId.of(DATASET))`
	`3668`	`+ .setUseLegacySql(false)`
	`3669`	`+ .addNamedParameter("geo",geoParameterValue)`
	`3670`	`+ .build();`
	`3671`	`+TableResultresult =bigquery.query(config);`
	`3672`	`+introwCount =0;`
	`3673`	`+for (FieldValueListrow :result.getValues()) {`
	`3674`	`+rowCount++;`
	`3675`	`+assertEquals(true,row.get(0).getBooleanValue());`
	`3676`	`+ }`
	`3677`	`+assertEquals(1,rowCount);`
	`3678`	`+ }`
	`3679`	`+`
`3658`	`3680`	`@Test`
`3659`	`3681`	`publicvoidtestListJobs() {`
`3660`	`3682`	`Page<Job>jobs =bigquery.listJobs();`

Comments

(0)