Skip to content

Commit 2e9979e

Browse files
authored
Merge pull request #375 from launchql/fix/postgis-dep
fix postgis dep
2 parents 646b915 + 7bfff0f commit 2e9979e

7 files changed

Lines changed: 2049 additions & 5789 deletions

File tree

graphile/graphile-cache/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if (cached) {
6767
}
6868
```
6969

70-
### Automatic cleanup when pools disappear
70+
### Automatic cleanup
7171

7272
The cleanup happens automatically:
7373

@@ -96,27 +96,27 @@ import { postgraphile } from 'postgraphile';
9696

9797
function getGraphileInstance(database: string, schema: string): GraphileCache {
9898
const key = `${database}.${schema}`;
99-
99+
100100
// Check cache first
101101
const cached = graphileCache.get(key);
102102
if (cached) {
103103
return cached;
104104
}
105-
105+
106106
// Create new instance
107107
const pgPool = getPgPool({ database });
108108
const handler = postgraphile(pgPool, schema, {
109109
graphqlRoute: '/graphql',
110110
graphiqlRoute: '/graphiql',
111111
// other options...
112112
});
113-
113+
114114
const entry: GraphileCache = {
115115
pgPool,
116116
pgPoolKey: database,
117117
handler
118118
};
119-
119+
120120
// Cache it
121121
graphileCache.set(key, entry);
122122
return entry;

graphile/graphile-plugin-connection-filter-postgis/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ npm install graphile-plugin-connection-filter-postgis
3434

3535
Requires `postgraphile@^4.5.0` and the following plugins appended prior to this plugin:
3636

37-
- `@graphile/postgis@0.1.0`
37+
- `graphile-postgis@^0.1.3`
3838
- `graphile-plugin-connection-filter@^2.0.0`
3939

4040
```ts
4141
import PostGISFilterPlugin from 'graphile-plugin-connection-filter-postgis';
42-
import PostGISPlugin from '@graphile/postgis';
42+
import PostGISPlugin from 'graphile-postgis';
4343
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
4444

4545
app.use(

graphile/graphile-plugin-connection-filter-postgis/__tests__/integration/queries.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { join } from 'path';
44
import type { GraphQLQueryFnObj } from 'graphile-test';
55
import { getConnectionsObject, seed, snapshot } from 'graphile-test';
66
import type { PgTestClient } from 'pgsql-test/test-client';
7-
import PostgisPlugin from '@graphile/postgis';
7+
import PostgisPlugin from 'graphile-postgis';
88
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
99

1010
import PostgisConnectionFilterPlugin from '../../src';

graphile/graphile-plugin-connection-filter-postgis/__tests__/integration/schema/__snapshots__/defaultOptions.test.ts.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,13 +490,15 @@ input GeographyPointMFilter {
490490
491491
type GeographyPointZ implements GeographyGeometryZ & GeographyInterface {
492492
geojson: GeoJSON
493+
height: Float!
493494
latitude: Float!
494495
longitude: Float!
495496
srid: Int!
496497
}
497498
498499
type GeographyPointZM implements GeographyGeometryZM & GeographyInterface {
499500
geojson: GeoJSON
501+
height: Float!
500502
latitude: Float!
501503
longitude: Float!
502504
srid: Int!
@@ -2329,13 +2331,15 @@ type GeometryPointZ implements GeometryGeometryZ & GeometryInterface {
23292331
srid: Int!
23302332
x: Float!
23312333
y: Float!
2334+
z: Float!
23322335
}
23332336
23342337
type GeometryPointZM implements GeometryGeometryZM & GeometryInterface {
23352338
geojson: GeoJSON
23362339
srid: Int!
23372340
x: Float!
23382341
y: Float!
2342+
z: Float!
23392343
}
23402344
23412345
type GeometryPolygon implements GeometryGeometry & GeometryInterface {

graphile/graphile-plugin-connection-filter-postgis/__tests__/integration/schema/defaultOptions.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from 'postgraphile';
77
import { getConnections, seed } from 'pgsql-test';
88
import type { PgTestClient } from 'pgsql-test/test-client';
9-
import PostgisPlugin from '@graphile/postgis';
9+
import PostgisPlugin from 'graphile-postgis';
1010
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
1111

1212
import PostgisConnectionFilterPlugin from '../../../src';

graphile/graphile-plugin-connection-filter-postgis/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"launchql"
4141
],
4242
"dependencies": {
43-
"@graphile/postgis": "^0.1.0",
43+
"graphile-postgis": "workspace:^",
4444
"graphile-build": "^4.14.1",
4545
"graphile-build-pg": "^4.14.1",
4646
"graphile-plugin-connection-filter": "workspace:^"
4747
},
4848
"peerDependencies": {
49-
"@graphile/postgis": "^0.1.0",
49+
"graphile-postgis": "workspace:^",
5050
"graphile-plugin-connection-filter": "workspace:^",
5151
"postgraphile": "^4.14.1"
5252
},

0 commit comments

Comments
 (0)