Commit472b209

authored

Merge pull request#23 from vitcpp/10-pgsphere-version

[ISSUE-10] Implemented propagation of pg sphere version.

2 parents001cee8 +894f9bb commit472b209Copy full SHA for 472b209

File tree

+22

-3

lines changed

+22

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ TESTS = init_test tables points euler circle line ellipse poly path box in`
`32`	`32`	`contains_ops contains_ops_compat bounding_box_gist gnomo healpix\`
`33`	`33`	`moc mocautocast epochprop`
`34`	`34`
	`35`	`+PG_CFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)`
	`36`	`+PG_CPPFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)`
	`37`	`+`
`35`	`38`	`ifndefCXXFLAGS`
`36`	`39`	`# no support for CXXFLAGS in PGXS before v11`
`37`	`40`	`CXXFLAGS = -Wall -Wpointer-arith -Wendif-labels\`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,9 @@`
`3`	`3`	`-- does not depend on contents of pg_sphere.sql.`
`4`	`4`	`--`
`5`	`5`	`CREATE EXTENSION pg_sphere;`
	`6`	`+select pg_sphere_version();`
	`7`	`+ pg_sphere_version`
	`8`	`+-------------------`
	`9`	`+ 1.2.1`
	`10`	`+(1 row)`
	`11`	`+`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,5 @@`
`3`	`3`	`-- does not depend on contents of pg_sphere.sql.`
`4`	`4`	`--`
`5`	`5`	`CREATE EXTENSION pg_sphere;`
	`6`	`+`
	`7`	`+select pg_sphere_version();`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,12 @@`
`1`	`1`	`#include"types.h"`
`2`	`2`
	`3`	`+#if !defined(PGSPHERE_VERSION)`
	`4`	`+#error "PGSPHERE_VERSION macro is not set"`
	`5`	`+#endif`
	`6`	`+`
	`7`	`+#definePGSPHERE_STRINGIFY_INTERNAL(x) #x`
	`8`	`+#definePGSPHERE_STRINGIFY(x) PGSPHERE_STRINGIFY_INTERNAL(x)`
	`9`	`+`
`3`	`10`	`/* Output functions */`
`4`	`11`
`5`	`12`
`@@ -527,7 +534,8 @@ spherebox_out(PG_FUNCTION_ARGS)`
`527`	`534`	`Datum`
`528`	`535`	`pg_sphere_version(PG_FUNCTION_ARGS)`
`529`	`536`	`{`
`530`		`-charbuffer= (char)palloc(20);`
`531`		`-sprintf(buffer,"1.1.5");`
`532`		`-PG_RETURN_CSTRING(buffer);`
	`537`	`+constchar*s=PGSPHERE_STRINGIFY(PGSPHERE_VERSION);`
	`538`	`+charp= (char)palloc(strlen(s)+1);`
	`539`	`+strcpy(p,s);`
	`540`	`+PG_RETURN_CSTRING(p);`
`533`	`541`	`}`

Comments

(0)