@pgpmjs/core 4.7.1 → 4.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/esm/export/export-meta.js +32 -32
  2. package/esm/export/export-migrations.js +6 -6
  3. package/export/export-meta.js +32 -32
  4. package/export/export-migrations.js +6 -6
  5. package/package.json +2 -2
package/esm/export/export-meta.js CHANGED
@@ -2,7 +2,7 @@ import { Parser } from 'csv-to-pg';
2
2
  import { getPgPool } from 'pg-cache';
3
3
  const config = {
4
4
  database: {
5
- schema: 'collections_public',
5
+ schema: 'metaschema_public',
6
6
  table: 'database',
7
7
  fields: {
8
8
  id: 'uuid',
@@ -12,7 +12,7 @@ const config = {
12
12
  }
13
13
  },
14
14
  database_extension: {
15
- schema: 'collections_public',
15
+ schema: 'metaschema_public',
16
16
  table: 'database_extension',
17
17
  fields: {
18
18
  name: 'text',
@@ -20,7 +20,7 @@ const config = {
20
20
  }
21
21
  },
22
22
  schema: {
23
- schema: 'collections_public',
23
+ schema: 'metaschema_public',
24
24
  table: 'schema',
25
25
  fields: {
26
26
  id: 'uuid',
@@ -31,7 +31,7 @@ const config = {
31
31
  }
32
32
  },
33
33
  table: {
34
- schema: 'collections_public',
34
+ schema: 'metaschema_public',
35
35
  table: 'table',
36
36
  fields: {
37
37
  id: 'uuid',
@@ -42,7 +42,7 @@ const config = {
42
42
  }
43
43
  },
44
44
  field: {
45
- schema: 'collections_public',
45
+ schema: 'metaschema_public',
46
46
  table: 'field',
47
47
  fields: {
48
48
  id: 'uuid',
@@ -54,7 +54,7 @@ const config = {
54
54
  }
55
55
  },
56
56
  domains: {
57
- schema: 'meta_public',
57
+ schema: 'services_public',
58
58
  table: 'domains',
59
59
  fields: {
60
60
  id: 'uuid',
@@ -66,7 +66,7 @@ const config = {
66
66
  }
67
67
  },
68
68
  sites: {
69
- schema: 'meta_public',
69
+ schema: 'services_public',
70
70
  table: 'sites',
71
71
  fields: {
72
72
  id: 'uuid',
@@ -81,7 +81,7 @@ const config = {
81
81
  }
82
82
  },
83
83
  apis: {
84
- schema: 'meta_public',
84
+ schema: 'services_public',
85
85
  table: 'apis',
86
86
  fields: {
87
87
  id: 'uuid',
@@ -94,7 +94,7 @@ const config = {
94
94
  }
95
95
  },
96
96
  apps: {
97
- schema: 'meta_public',
97
+ schema: 'services_public',
98
98
  table: 'apps',
99
99
  fields: {
100
100
  id: 'uuid',
@@ -109,7 +109,7 @@ const config = {
109
109
  }
110
110
  },
111
111
  site_modules: {
112
- schema: 'meta_public',
112
+ schema: 'services_public',
113
113
  table: 'site_modules',
114
114
  fields: {
115
115
  id: 'uuid',
@@ -120,7 +120,7 @@ const config = {
120
120
  }
121
121
  },
122
122
  site_themes: {
123
- schema: 'meta_public',
123
+ schema: 'services_public',
124
124
  table: 'site_themes',
125
125
  fields: {
126
126
  id: 'uuid',
@@ -130,7 +130,7 @@ const config = {
130
130
  }
131
131
  },
132
132
  api_modules: {
133
- schema: 'meta_public',
133
+ schema: 'services_public',
134
134
  table: 'api_modules',
135
135
  fields: {
136
136
  id: 'uuid',
@@ -141,7 +141,7 @@ const config = {
141
141
  }
142
142
  },
143
143
  api_extensions: {
144
- schema: 'meta_public',
144
+ schema: 'services_public',
145
145
  table: 'api_extensions',
146
146
  fields: {
147
147
  id: 'uuid',
@@ -151,7 +151,7 @@ const config = {
151
151
  }
152
152
  },
153
153
  api_schemata: {
154
- schema: 'meta_public',
154
+ schema: 'services_public',
155
155
  table: 'api_schemata',
156
156
  fields: {
157
157
  id: 'uuid',
@@ -161,7 +161,7 @@ const config = {
161
161
  }
162
162
  },
163
163
  rls_module: {
164
- schema: 'meta_public',
164
+ schema: 'metaschema_modules_public',
165
165
  table: 'rls_module',
166
166
  fields: {
167
167
  id: 'uuid',
@@ -178,7 +178,7 @@ const config = {
178
178
  }
179
179
  },
180
180
  user_auth_module: {
181
- schema: 'meta_public',
181
+ schema: 'metaschema_modules_public',
182
182
  table: 'user_auth_module',
183
183
  fields: {
184
184
  id: 'uuid',
@@ -224,21 +224,21 @@ export const exportMeta = async ({ opts, dbname, database_id }) => {
224
224
  }
225
225
  }
226
226
  };
227
- await queryAndParse('database', `SELECT * FROM collections_public.database WHERE id = $1`);
228
- await queryAndParse('schema', `SELECT * FROM collections_public.schema WHERE database_id = $1`);
229
- await queryAndParse('table', `SELECT * FROM collections_public.table WHERE database_id = $1`);
230
- await queryAndParse('field', `SELECT * FROM collections_public.field WHERE database_id = $1`);
231
- await queryAndParse('domains', `SELECT * FROM meta_public.domains WHERE database_id = $1`);
232
- await queryAndParse('apis', `SELECT * FROM meta_public.apis WHERE database_id = $1`);
233
- await queryAndParse('sites', `SELECT * FROM meta_public.sites WHERE database_id = $1`);
234
- await queryAndParse('api_modules', `SELECT * FROM meta_public.api_modules WHERE database_id = $1`);
235
- await queryAndParse('site_modules', `SELECT * FROM meta_public.site_modules WHERE database_id = $1`);
236
- await queryAndParse('site_themes', `SELECT * FROM meta_public.site_themes WHERE database_id = $1`);
237
- await queryAndParse('apps', `SELECT * FROM meta_public.apps WHERE database_id = $1`);
238
- await queryAndParse('database_extension', `SELECT * FROM collections_public.database_extension WHERE database_id = $1`);
239
- await queryAndParse('api_extensions', `SELECT * FROM meta_public.api_extensions WHERE database_id = $1`);
240
- await queryAndParse('api_schemata', `SELECT * FROM meta_public.api_schemata WHERE database_id = $1`);
241
- await queryAndParse('rls_module', `SELECT * FROM meta_public.rls_module WHERE database_id = $1`);
242
- await queryAndParse('user_auth_module', `SELECT * FROM meta_public.user_auth_module WHERE database_id = $1`);
227
+ await queryAndParse('database', `SELECT * FROM metaschema_public.database WHERE id = $1`);
228
+ await queryAndParse('schema', `SELECT * FROM metaschema_public.schema WHERE database_id = $1`);
229
+ await queryAndParse('table', `SELECT * FROM metaschema_public.table WHERE database_id = $1`);
230
+ await queryAndParse('field', `SELECT * FROM metaschema_public.field WHERE database_id = $1`);
231
+ await queryAndParse('domains', `SELECT * FROM services_public.domains WHERE database_id = $1`);
232
+ await queryAndParse('apis', `SELECT * FROM services_public.apis WHERE database_id = $1`);
233
+ await queryAndParse('sites', `SELECT * FROM services_public.sites WHERE database_id = $1`);
234
+ await queryAndParse('api_modules', `SELECT * FROM services_public.api_modules WHERE database_id = $1`);
235
+ await queryAndParse('site_modules', `SELECT * FROM services_public.site_modules WHERE database_id = $1`);
236
+ await queryAndParse('site_themes', `SELECT * FROM services_public.site_themes WHERE database_id = $1`);
237
+ await queryAndParse('apps', `SELECT * FROM services_public.apps WHERE database_id = $1`);
238
+ await queryAndParse('database_extension', `SELECT * FROM metaschema_public.database_extension WHERE database_id = $1`);
239
+ await queryAndParse('api_extensions', `SELECT * FROM services_public.api_extensions WHERE database_id = $1`);
240
+ await queryAndParse('api_schemata', `SELECT * FROM services_public.api_schemata WHERE database_id = $1`);
241
+ await queryAndParse('rls_module', `SELECT * FROM metaschema_modules_public.rls_module WHERE database_id = $1`);
242
+ await queryAndParse('user_auth_module', `SELECT * FROM metaschema_modules_public.user_auth_module WHERE database_id = $1`);
243
243
  return Object.entries(sql).reduce((m, [_, v]) => m + '\n\n' + v, '');
244
244
  };
package/esm/export/export-migrations.js CHANGED
@@ -100,8 +100,8 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
100
100
  ...options.pg,
101
101
  database
102
102
  });
103
- const db = await pgPool.query(`select * from collections_public.database where id=$1`, [databaseId]);
104
- const schemas = await pgPool.query(`select * from collections_public.schema where database_id=$1`, [databaseId]);
103
+ const db = await pgPool.query(`select * from metaschema_public.database where id=$1`, [databaseId]);
104
+ const schemas = await pgPool.query(`select * from metaschema_public.schema where database_id=$1`, [databaseId]);
105
105
  if (!db?.rows?.length) {
106
106
  console.log('NO DATABASES.');
107
107
  return;
@@ -180,7 +180,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
180
180
  deps: [],
181
181
  deploy: 'migrate/meta',
182
182
  content: `SET session_replication_role TO replica;
183
- -- using replica in case we are deploying triggers to collections_public
183
+ -- using replica in case we are deploying triggers to metaschema_public
184
184
 
185
185
  -- unaccent, postgis affected and require grants
186
186
  GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public to public;
@@ -199,12 +199,12 @@ ${meta}
199
199
 
200
200
  -- TODO: Research needed - These UPDATE statements may be a security leak.
201
201
  -- They appear to rebind exported metadata to the target database after import,
202
- -- but exposing dbname in meta_public tables could leak internal database names.
202
+ -- but exposing dbname in services_public tables could leak internal database names.
203
203
  -- Consider removing entirely or gating behind an explicit flag.
204
- -- UPDATE meta_public.apis
204
+ -- UPDATE services_public.apis
205
205
  -- SET dbname = current_database() WHERE TRUE;
206
206
 
207
- -- UPDATE meta_public.sites
207
+ -- UPDATE services_public.sites
208
208
  -- SET dbname = current_database() WHERE TRUE;
209
209
 
210
210
  SET session_replication_role TO DEFAULT;
package/export/export-meta.js CHANGED
@@ -5,7 +5,7 @@ const csv_to_pg_1 = require("csv-to-pg");
5
5
  const pg_cache_1 = require("pg-cache");
6
6
  const config = {
7
7
  database: {
8
- schema: 'collections_public',
8
+ schema: 'metaschema_public',
9
9
  table: 'database',
10
10
  fields: {
11
11
  id: 'uuid',
@@ -15,7 +15,7 @@ const config = {
15
15
  }
16
16
  },
17
17
  database_extension: {
18
- schema: 'collections_public',
18
+ schema: 'metaschema_public',
19
19
  table: 'database_extension',
20
20
  fields: {
21
21
  name: 'text',
@@ -23,7 +23,7 @@ const config = {
23
23
  }
24
24
  },
25
25
  schema: {
26
- schema: 'collections_public',
26
+ schema: 'metaschema_public',
27
27
  table: 'schema',
28
28
  fields: {
29
29
  id: 'uuid',
@@ -34,7 +34,7 @@ const config = {
34
34
  }
35
35
  },
36
36
  table: {
37
- schema: 'collections_public',
37
+ schema: 'metaschema_public',
38
38
  table: 'table',
39
39
  fields: {
40
40
  id: 'uuid',
@@ -45,7 +45,7 @@ const config = {
45
45
  }
46
46
  },
47
47
  field: {
48
- schema: 'collections_public',
48
+ schema: 'metaschema_public',
49
49
  table: 'field',
50
50
  fields: {
51
51
  id: 'uuid',
@@ -57,7 +57,7 @@ const config = {
57
57
  }
58
58
  },
59
59
  domains: {
60
- schema: 'meta_public',
60
+ schema: 'services_public',
61
61
  table: 'domains',
62
62
  fields: {
63
63
  id: 'uuid',
@@ -69,7 +69,7 @@ const config = {
69
69
  }
70
70
  },
71
71
  sites: {
72
- schema: 'meta_public',
72
+ schema: 'services_public',
73
73
  table: 'sites',
74
74
  fields: {
75
75
  id: 'uuid',
@@ -84,7 +84,7 @@ const config = {
84
84
  }
85
85
  },
86
86
  apis: {
87
- schema: 'meta_public',
87
+ schema: 'services_public',
88
88
  table: 'apis',
89
89
  fields: {
90
90
  id: 'uuid',
@@ -97,7 +97,7 @@ const config = {
97
97
  }
98
98
  },
99
99
  apps: {
100
- schema: 'meta_public',
100
+ schema: 'services_public',
101
101
  table: 'apps',
102
102
  fields: {
103
103
  id: 'uuid',
@@ -112,7 +112,7 @@ const config = {
112
112
  }
113
113
  },
114
114
  site_modules: {
115
- schema: 'meta_public',
115
+ schema: 'services_public',
116
116
  table: 'site_modules',
117
117
  fields: {
118
118
  id: 'uuid',
@@ -123,7 +123,7 @@ const config = {
123
123
  }
124
124
  },
125
125
  site_themes: {
126
- schema: 'meta_public',
126
+ schema: 'services_public',
127
127
  table: 'site_themes',
128
128
  fields: {
129
129
  id: 'uuid',
@@ -133,7 +133,7 @@ const config = {
133
133
  }
134
134
  },
135
135
  api_modules: {
136
- schema: 'meta_public',
136
+ schema: 'services_public',
137
137
  table: 'api_modules',
138
138
  fields: {
139
139
  id: 'uuid',
@@ -144,7 +144,7 @@ const config = {
144
144
  }
145
145
  },
146
146
  api_extensions: {
147
- schema: 'meta_public',
147
+ schema: 'services_public',
148
148
  table: 'api_extensions',
149
149
  fields: {
150
150
  id: 'uuid',
@@ -154,7 +154,7 @@ const config = {
154
154
  }
155
155
  },
156
156
  api_schemata: {
157
- schema: 'meta_public',
157
+ schema: 'services_public',
158
158
  table: 'api_schemata',
159
159
  fields: {
160
160
  id: 'uuid',
@@ -164,7 +164,7 @@ const config = {
164
164
  }
165
165
  },
166
166
  rls_module: {
167
- schema: 'meta_public',
167
+ schema: 'metaschema_modules_public',
168
168
  table: 'rls_module',
169
169
  fields: {
170
170
  id: 'uuid',
@@ -181,7 +181,7 @@ const config = {
181
181
  }
182
182
  },
183
183
  user_auth_module: {
184
- schema: 'meta_public',
184
+ schema: 'metaschema_modules_public',
185
185
  table: 'user_auth_module',
186
186
  fields: {
187
187
  id: 'uuid',
@@ -227,22 +227,22 @@ const exportMeta = async ({ opts, dbname, database_id }) => {
227
227
  }
228
228
  }
229
229
  };
230
- await queryAndParse('database', `SELECT * FROM collections_public.database WHERE id = $1`);
231
- await queryAndParse('schema', `SELECT * FROM collections_public.schema WHERE database_id = $1`);
232
- await queryAndParse('table', `SELECT * FROM collections_public.table WHERE database_id = $1`);
233
- await queryAndParse('field', `SELECT * FROM collections_public.field WHERE database_id = $1`);
234
- await queryAndParse('domains', `SELECT * FROM meta_public.domains WHERE database_id = $1`);
235
- await queryAndParse('apis', `SELECT * FROM meta_public.apis WHERE database_id = $1`);
236
- await queryAndParse('sites', `SELECT * FROM meta_public.sites WHERE database_id = $1`);
237
- await queryAndParse('api_modules', `SELECT * FROM meta_public.api_modules WHERE database_id = $1`);
238
- await queryAndParse('site_modules', `SELECT * FROM meta_public.site_modules WHERE database_id = $1`);
239
- await queryAndParse('site_themes', `SELECT * FROM meta_public.site_themes WHERE database_id = $1`);
240
- await queryAndParse('apps', `SELECT * FROM meta_public.apps WHERE database_id = $1`);
241
- await queryAndParse('database_extension', `SELECT * FROM collections_public.database_extension WHERE database_id = $1`);
242
- await queryAndParse('api_extensions', `SELECT * FROM meta_public.api_extensions WHERE database_id = $1`);
243
- await queryAndParse('api_schemata', `SELECT * FROM meta_public.api_schemata WHERE database_id = $1`);
244
- await queryAndParse('rls_module', `SELECT * FROM meta_public.rls_module WHERE database_id = $1`);
245
- await queryAndParse('user_auth_module', `SELECT * FROM meta_public.user_auth_module WHERE database_id = $1`);
230
+ await queryAndParse('database', `SELECT * FROM metaschema_public.database WHERE id = $1`);
231
+ await queryAndParse('schema', `SELECT * FROM metaschema_public.schema WHERE database_id = $1`);
232
+ await queryAndParse('table', `SELECT * FROM metaschema_public.table WHERE database_id = $1`);
233
+ await queryAndParse('field', `SELECT * FROM metaschema_public.field WHERE database_id = $1`);
234
+ await queryAndParse('domains', `SELECT * FROM services_public.domains WHERE database_id = $1`);
235
+ await queryAndParse('apis', `SELECT * FROM services_public.apis WHERE database_id = $1`);
236
+ await queryAndParse('sites', `SELECT * FROM services_public.sites WHERE database_id = $1`);
237
+ await queryAndParse('api_modules', `SELECT * FROM services_public.api_modules WHERE database_id = $1`);
238
+ await queryAndParse('site_modules', `SELECT * FROM services_public.site_modules WHERE database_id = $1`);
239
+ await queryAndParse('site_themes', `SELECT * FROM services_public.site_themes WHERE database_id = $1`);
240
+ await queryAndParse('apps', `SELECT * FROM services_public.apps WHERE database_id = $1`);
241
+ await queryAndParse('database_extension', `SELECT * FROM metaschema_public.database_extension WHERE database_id = $1`);
242
+ await queryAndParse('api_extensions', `SELECT * FROM services_public.api_extensions WHERE database_id = $1`);
243
+ await queryAndParse('api_schemata', `SELECT * FROM services_public.api_schemata WHERE database_id = $1`);
244
+ await queryAndParse('rls_module', `SELECT * FROM metaschema_modules_public.rls_module WHERE database_id = $1`);
245
+ await queryAndParse('user_auth_module', `SELECT * FROM metaschema_modules_public.user_auth_module WHERE database_id = $1`);
246
246
  return Object.entries(sql).reduce((m, [_, v]) => m + '\n\n' + v, '');
247
247
  };
248
248
  exports.exportMeta = exportMeta;
package/export/export-migrations.js CHANGED
@@ -106,8 +106,8 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
106
106
  ...options.pg,
107
107
  database
108
108
  });
109
- const db = await pgPool.query(`select * from collections_public.database where id=$1`, [databaseId]);
110
- const schemas = await pgPool.query(`select * from collections_public.schema where database_id=$1`, [databaseId]);
109
+ const db = await pgPool.query(`select * from metaschema_public.database where id=$1`, [databaseId]);
110
+ const schemas = await pgPool.query(`select * from metaschema_public.schema where database_id=$1`, [databaseId]);
111
111
  if (!db?.rows?.length) {
112
112
  console.log('NO DATABASES.');
113
113
  return;
@@ -186,7 +186,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
186
186
  deps: [],
187
187
  deploy: 'migrate/meta',
188
188
  content: `SET session_replication_role TO replica;
189
- -- using replica in case we are deploying triggers to collections_public
189
+ -- using replica in case we are deploying triggers to metaschema_public
190
190
 
191
191
  -- unaccent, postgis affected and require grants
192
192
  GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public to public;
@@ -205,12 +205,12 @@ ${meta}
205
205
 
206
206
  -- TODO: Research needed - These UPDATE statements may be a security leak.
207
207
  -- They appear to rebind exported metadata to the target database after import,
208
- -- but exposing dbname in meta_public tables could leak internal database names.
208
+ -- but exposing dbname in services_public tables could leak internal database names.
209
209
  -- Consider removing entirely or gating behind an explicit flag.
210
- -- UPDATE meta_public.apis
210
+ -- UPDATE services_public.apis
211
211
  -- SET dbname = current_database() WHERE TRUE;
212
212
 
213
- -- UPDATE meta_public.sites
213
+ -- UPDATE services_public.sites
214
214
  -- SET dbname = current_database() WHERE TRUE;
215
215
 
216
216
  SET session_replication_role TO DEFAULT;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pgpmjs/core",
3
- "version": "4.7.1",
3
+ "version": "4.7.2",
4
4
  "author": "Constructive <developers@constructive.io>",
5
5
  "description": "PGPM Package and Migration Tools",
6
6
  "main": "index.js",
@@ -64,5 +64,5 @@
64
64
  "pgsql-parser": "^17.9.9",
65
65
  "yanse": "^0.1.11"
66
66
  },
67
- "gitHead": "acb072b93704ad5218dd2c38306680f3750ead09"
67
+ "gitHead": "5eca40587d2b8e2362a2308bc3fa8c1eecf131da"
68
68
  }