relq 1.0.98 → 1.0.100

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 (21) hide show
  1. package/dist/cjs/cli/adapters/cockroachdb/introspect.cjs +3 -3
  2. package/dist/cjs/cli/adapters/dsql/introspect.cjs +3 -3
  3. package/dist/cjs/cli/adapters/nile/introspect.cjs +3 -3
  4. package/dist/cjs/cli/adapters/postgres/introspect.cjs +3 -3
  5. package/dist/cjs/cli/utils/ast-codegen.cjs +1 -1
  6. package/dist/cjs/cli/utils/ast-transformer.cjs +10 -0
  7. package/dist/cjs/cli/utils/cockroachdb/introspect.cjs +1 -1
  8. package/dist/cjs/cli/utils/dsql/introspect.cjs +1 -1
  9. package/dist/cjs/cli/utils/nile/introspect.cjs +1 -1
  10. package/dist/cjs/cli/utils/postgres/introspect.cjs +1 -1
  11. package/dist/esm/cli/adapters/cockroachdb/introspect.js +3 -3
  12. package/dist/esm/cli/adapters/dsql/introspect.js +3 -3
  13. package/dist/esm/cli/adapters/nile/introspect.js +3 -3
  14. package/dist/esm/cli/adapters/postgres/introspect.js +3 -3
  15. package/dist/esm/cli/utils/ast-codegen.js +1 -1
  16. package/dist/esm/cli/utils/ast-transformer.js +10 -0
  17. package/dist/esm/cli/utils/cockroachdb/introspect.js +1 -1
  18. package/dist/esm/cli/utils/dsql/introspect.js +1 -1
  19. package/dist/esm/cli/utils/nile/introspect.js +1 -1
  20. package/dist/esm/cli/utils/postgres/introspect.js +1 -1
  21. package/package.json +1 -1
package/dist/cjs/cli/adapters/cockroachdb/introspect.cjs CHANGED
@@ -262,7 +262,7 @@ async function introspectTables(pool, options) {
262
262
  pg_catalog.pg_get_userbyid(c.relowner) as owner
263
263
  FROM pg_class c
264
264
  JOIN pg_namespace n ON c.relnamespace = n.oid
265
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
265
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
266
266
  ${schemaFilter}
267
267
  ORDER BY n.nspname, c.relname
268
268
  `, params);
@@ -302,7 +302,7 @@ async function introspectTables(pool, options) {
302
302
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
303
303
  WHERE a.attnum > 0
304
304
  AND NOT a.attisdropped
305
- AND c.relkind IN ('r', 'v', 'm', 'f')
305
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
306
306
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
307
307
  ORDER BY a.attrelid, a.attnum
308
308
  `, params);
@@ -697,7 +697,7 @@ async function introspectCompositeTypes(pool) {
697
697
  AND NOT EXISTS (
698
698
  SELECT 1 FROM pg_class c
699
699
  WHERE c.reltype = t.oid
700
- AND c.relkind IN ('r', 'v', 'm', 'f')
700
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
701
701
  )
702
702
  GROUP BY t.oid, t.typname, n.nspname
703
703
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/adapters/dsql/introspect.cjs CHANGED
@@ -258,7 +258,7 @@ async function introspectTables(pool, options) {
258
258
  pg_catalog.pg_get_userbyid(c.relowner) as owner
259
259
  FROM pg_class c
260
260
  JOIN pg_namespace n ON c.relnamespace = n.oid
261
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
261
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
262
262
  ${schemaFilter}
263
263
  ORDER BY n.nspname, c.relname
264
264
  `, params);
@@ -295,7 +295,7 @@ async function introspectTables(pool, options) {
295
295
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
296
296
  WHERE a.attnum > 0
297
297
  AND NOT a.attisdropped
298
- AND c.relkind IN ('r', 'v', 'm', 'f')
298
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
299
299
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
300
300
  ORDER BY a.attrelid, a.attnum
301
301
  `, params);
@@ -685,7 +685,7 @@ async function introspectCompositeTypes(pool) {
685
685
  AND NOT EXISTS (
686
686
  SELECT 1 FROM pg_class c
687
687
  WHERE c.reltype = t.oid
688
- AND c.relkind IN ('r', 'v', 'm', 'f')
688
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
689
689
  )
690
690
  GROUP BY t.oid, t.typname, n.nspname
691
691
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/adapters/nile/introspect.cjs CHANGED
@@ -254,7 +254,7 @@ async function introspectTables(pool, options) {
254
254
  pg_catalog.pg_get_userbyid(c.relowner) as owner
255
255
  FROM pg_class c
256
256
  JOIN pg_namespace n ON c.relnamespace = n.oid
257
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
257
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
258
258
  ${schemaFilter}
259
259
  ORDER BY n.nspname, c.relname
260
260
  `, params);
@@ -291,7 +291,7 @@ async function introspectTables(pool, options) {
291
291
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
292
292
  WHERE a.attnum > 0
293
293
  AND NOT a.attisdropped
294
- AND c.relkind IN ('r', 'v', 'm', 'f')
294
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
295
295
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
296
296
  ORDER BY a.attrelid, a.attnum
297
297
  `, params);
@@ -675,7 +675,7 @@ async function introspectCompositeTypes(pool) {
675
675
  AND NOT EXISTS (
676
676
  SELECT 1 FROM pg_class c
677
677
  WHERE c.reltype = t.oid
678
- AND c.relkind IN ('r', 'v', 'm', 'f')
678
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
679
679
  )
680
680
  GROUP BY t.oid, t.typname, n.nspname
681
681
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/adapters/postgres/introspect.cjs CHANGED
@@ -258,7 +258,7 @@ async function introspectTables(pool, options) {
258
258
  pg_catalog.pg_get_userbyid(c.relowner) as owner
259
259
  FROM pg_class c
260
260
  JOIN pg_namespace n ON c.relnamespace = n.oid
261
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
261
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
262
262
  ${schemaFilter}
263
263
  ORDER BY n.nspname, c.relname
264
264
  `, params);
@@ -295,7 +295,7 @@ async function introspectTables(pool, options) {
295
295
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
296
296
  WHERE a.attnum > 0
297
297
  AND NOT a.attisdropped
298
- AND c.relkind IN ('r', 'v', 'm', 'f')
298
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
299
299
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
300
300
  ORDER BY a.attrelid, a.attnum
301
301
  `, params);
@@ -679,7 +679,7 @@ async function introspectCompositeTypes(pool) {
679
679
  AND NOT EXISTS (
680
680
  SELECT 1 FROM pg_class c
681
681
  WHERE c.reltype = t.oid
682
- AND c.relkind IN ('r', 'v', 'm', 'f')
682
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
683
683
  )
684
684
  GROUP BY t.oid, t.typname, n.nspname
685
685
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/utils/ast-codegen.cjs CHANGED
@@ -731,7 +731,7 @@ function generateSequenceCode(seq, useCamelCase) {
731
731
  if (seq.cycle)
732
732
  opts.push(`cycle: true`);
733
733
  if (seq.ownedBy)
734
- opts.push(`ownedBy: { table: '${seq.ownedBy.table}', column: '${seq.ownedBy.column}' }`);
734
+ opts.push(`ownedBy: '${seq.ownedBy.table}.${seq.ownedBy.column}'`);
735
735
  const trackingId = seq.trackingId || generateTrackingId('s');
736
736
  opts.push(`trackingId: '${trackingId}'`);
737
737
  const optsStr = opts.length > 0 ? `, { ${opts.join(', ')} }` : '';
package/dist/cjs/cli/utils/ast-transformer.cjs CHANGED
@@ -749,6 +749,16 @@ async function introspectedToParsedSchema(schema) {
749
749
  comment: t.comment,
750
750
  });
751
751
  }
752
+ const isInternal = (name) => name.startsWith('_relq_') || name.startsWith('__relq_');
753
+ parsed.tables = parsed.tables.filter(t => !isInternal(t.name));
754
+ parsed.sequences = parsed.sequences.filter(s => {
755
+ if (isInternal(s.name))
756
+ return false;
757
+ if (s.ownedBy && isInternal(s.ownedBy.table))
758
+ return false;
759
+ return true;
760
+ });
761
+ parsed.triggers = parsed.triggers.filter(t => !isInternal(t.table));
752
762
  return parsed;
753
763
  }
754
764
  function normalizeTypeName(dataType, udtName) {
package/dist/cjs/cli/utils/cockroachdb/introspect.cjs CHANGED
@@ -322,7 +322,7 @@ async function introspectCockroachDB(connection, options) {
322
322
  AND NOT EXISTS (
323
323
  SELECT 1 FROM pg_class c
324
324
  WHERE c.reltype = t.oid
325
- AND c.relkind IN ('r', 'v', 'm', 'f')
325
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
326
326
  )
327
327
  GROUP BY t.oid, t.typname, n.nspname
328
328
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/utils/dsql/introspect.cjs CHANGED
@@ -310,7 +310,7 @@ async function introspectDsql(connection, options) {
310
310
  AND NOT EXISTS (
311
311
  SELECT 1 FROM pg_class c
312
312
  WHERE c.reltype = t.oid
313
- AND c.relkind IN ('r', 'v', 'm', 'f')
313
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
314
314
  )
315
315
  GROUP BY t.oid, t.typname, n.nspname
316
316
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/utils/nile/introspect.cjs CHANGED
@@ -338,7 +338,7 @@ async function introspectNile(connection, options) {
338
338
  AND NOT EXISTS (
339
339
  SELECT 1 FROM pg_class c
340
340
  WHERE c.reltype = t.oid
341
- AND c.relkind IN ('r', 'v', 'm', 'f')
341
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
342
342
  )
343
343
  GROUP BY t.oid, t.typname, n.nspname
344
344
  ORDER BY n.nspname, t.typname
package/dist/cjs/cli/utils/postgres/introspect.cjs CHANGED
@@ -331,7 +331,7 @@ async function introspectPostgres(connection, options) {
331
331
  AND NOT EXISTS (
332
332
  SELECT 1 FROM pg_class c
333
333
  WHERE c.reltype = t.oid
334
- AND c.relkind IN ('r', 'v', 'm', 'f')
334
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
335
335
  )
336
336
  GROUP BY t.oid, t.typname, n.nspname
337
337
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/adapters/cockroachdb/introspect.js CHANGED
@@ -223,7 +223,7 @@ async function introspectTables(pool, options) {
223
223
  pg_catalog.pg_get_userbyid(c.relowner) as owner
224
224
  FROM pg_class c
225
225
  JOIN pg_namespace n ON c.relnamespace = n.oid
226
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
226
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
227
227
  ${schemaFilter}
228
228
  ORDER BY n.nspname, c.relname
229
229
  `, params);
@@ -263,7 +263,7 @@ async function introspectTables(pool, options) {
263
263
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
264
264
  WHERE a.attnum > 0
265
265
  AND NOT a.attisdropped
266
- AND c.relkind IN ('r', 'v', 'm', 'f')
266
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
267
267
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
268
268
  ORDER BY a.attrelid, a.attnum
269
269
  `, params);
@@ -658,7 +658,7 @@ async function introspectCompositeTypes(pool) {
658
658
  AND NOT EXISTS (
659
659
  SELECT 1 FROM pg_class c
660
660
  WHERE c.reltype = t.oid
661
- AND c.relkind IN ('r', 'v', 'm', 'f')
661
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
662
662
  )
663
663
  GROUP BY t.oid, t.typname, n.nspname
664
664
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/adapters/dsql/introspect.js CHANGED
@@ -219,7 +219,7 @@ async function introspectTables(pool, options) {
219
219
  pg_catalog.pg_get_userbyid(c.relowner) as owner
220
220
  FROM pg_class c
221
221
  JOIN pg_namespace n ON c.relnamespace = n.oid
222
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
222
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
223
223
  ${schemaFilter}
224
224
  ORDER BY n.nspname, c.relname
225
225
  `, params);
@@ -256,7 +256,7 @@ async function introspectTables(pool, options) {
256
256
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
257
257
  WHERE a.attnum > 0
258
258
  AND NOT a.attisdropped
259
- AND c.relkind IN ('r', 'v', 'm', 'f')
259
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
260
260
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
261
261
  ORDER BY a.attrelid, a.attnum
262
262
  `, params);
@@ -646,7 +646,7 @@ async function introspectCompositeTypes(pool) {
646
646
  AND NOT EXISTS (
647
647
  SELECT 1 FROM pg_class c
648
648
  WHERE c.reltype = t.oid
649
- AND c.relkind IN ('r', 'v', 'm', 'f')
649
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
650
650
  )
651
651
  GROUP BY t.oid, t.typname, n.nspname
652
652
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/adapters/nile/introspect.js CHANGED
@@ -215,7 +215,7 @@ async function introspectTables(pool, options) {
215
215
  pg_catalog.pg_get_userbyid(c.relowner) as owner
216
216
  FROM pg_class c
217
217
  JOIN pg_namespace n ON c.relnamespace = n.oid
218
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
218
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
219
219
  ${schemaFilter}
220
220
  ORDER BY n.nspname, c.relname
221
221
  `, params);
@@ -252,7 +252,7 @@ async function introspectTables(pool, options) {
252
252
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
253
253
  WHERE a.attnum > 0
254
254
  AND NOT a.attisdropped
255
- AND c.relkind IN ('r', 'v', 'm', 'f')
255
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
256
256
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
257
257
  ORDER BY a.attrelid, a.attnum
258
258
  `, params);
@@ -636,7 +636,7 @@ async function introspectCompositeTypes(pool) {
636
636
  AND NOT EXISTS (
637
637
  SELECT 1 FROM pg_class c
638
638
  WHERE c.reltype = t.oid
639
- AND c.relkind IN ('r', 'v', 'm', 'f')
639
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
640
640
  )
641
641
  GROUP BY t.oid, t.typname, n.nspname
642
642
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/adapters/postgres/introspect.js CHANGED
@@ -219,7 +219,7 @@ async function introspectTables(pool, options) {
219
219
  pg_catalog.pg_get_userbyid(c.relowner) as owner
220
220
  FROM pg_class c
221
221
  JOIN pg_namespace n ON c.relnamespace = n.oid
222
- WHERE c.relkind IN ('r', 'v', 'm', 'f')
222
+ WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
223
223
  ${schemaFilter}
224
224
  ORDER BY n.nspname, c.relname
225
225
  `, params);
@@ -256,7 +256,7 @@ async function introspectTables(pool, options) {
256
256
  LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
257
257
  WHERE a.attnum > 0
258
258
  AND NOT a.attisdropped
259
- AND c.relkind IN ('r', 'v', 'm', 'f')
259
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
260
260
  ${schemaFilter.replace('$1', '$' + (params.length + 1))}
261
261
  ORDER BY a.attrelid, a.attnum
262
262
  `, params);
@@ -640,7 +640,7 @@ async function introspectCompositeTypes(pool) {
640
640
  AND NOT EXISTS (
641
641
  SELECT 1 FROM pg_class c
642
642
  WHERE c.reltype = t.oid
643
- AND c.relkind IN ('r', 'v', 'm', 'f')
643
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
644
644
  )
645
645
  GROUP BY t.oid, t.typname, n.nspname
646
646
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/utils/ast-codegen.js CHANGED
@@ -722,7 +722,7 @@ function generateSequenceCode(seq, useCamelCase) {
722
722
  if (seq.cycle)
723
723
  opts.push(`cycle: true`);
724
724
  if (seq.ownedBy)
725
- opts.push(`ownedBy: { table: '${seq.ownedBy.table}', column: '${seq.ownedBy.column}' }`);
725
+ opts.push(`ownedBy: '${seq.ownedBy.table}.${seq.ownedBy.column}'`);
726
726
  const trackingId = seq.trackingId || generateTrackingId('s');
727
727
  opts.push(`trackingId: '${trackingId}'`);
728
728
  const optsStr = opts.length > 0 ? `, { ${opts.join(', ')} }` : '';
package/dist/esm/cli/utils/ast-transformer.js CHANGED
@@ -739,6 +739,16 @@ export async function introspectedToParsedSchema(schema) {
739
739
  comment: t.comment,
740
740
  });
741
741
  }
742
+ const isInternal = (name) => name.startsWith('_relq_') || name.startsWith('__relq_');
743
+ parsed.tables = parsed.tables.filter(t => !isInternal(t.name));
744
+ parsed.sequences = parsed.sequences.filter(s => {
745
+ if (isInternal(s.name))
746
+ return false;
747
+ if (s.ownedBy && isInternal(s.ownedBy.table))
748
+ return false;
749
+ return true;
750
+ });
751
+ parsed.triggers = parsed.triggers.filter(t => !isInternal(t.table));
742
752
  return parsed;
743
753
  }
744
754
  function normalizeTypeName(dataType, udtName) {
package/dist/esm/cli/utils/cockroachdb/introspect.js CHANGED
@@ -286,7 +286,7 @@ export async function introspectCockroachDB(connection, options) {
286
286
  AND NOT EXISTS (
287
287
  SELECT 1 FROM pg_class c
288
288
  WHERE c.reltype = t.oid
289
- AND c.relkind IN ('r', 'v', 'm', 'f')
289
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
290
290
  )
291
291
  GROUP BY t.oid, t.typname, n.nspname
292
292
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/utils/dsql/introspect.js CHANGED
@@ -274,7 +274,7 @@ export async function introspectDsql(connection, options) {
274
274
  AND NOT EXISTS (
275
275
  SELECT 1 FROM pg_class c
276
276
  WHERE c.reltype = t.oid
277
- AND c.relkind IN ('r', 'v', 'm', 'f')
277
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
278
278
  )
279
279
  GROUP BY t.oid, t.typname, n.nspname
280
280
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/utils/nile/introspect.js CHANGED
@@ -302,7 +302,7 @@ export async function introspectNile(connection, options) {
302
302
  AND NOT EXISTS (
303
303
  SELECT 1 FROM pg_class c
304
304
  WHERE c.reltype = t.oid
305
- AND c.relkind IN ('r', 'v', 'm', 'f')
305
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
306
306
  )
307
307
  GROUP BY t.oid, t.typname, n.nspname
308
308
  ORDER BY n.nspname, t.typname
package/dist/esm/cli/utils/postgres/introspect.js CHANGED
@@ -295,7 +295,7 @@ export async function introspectPostgres(connection, options) {
295
295
  AND NOT EXISTS (
296
296
  SELECT 1 FROM pg_class c
297
297
  WHERE c.reltype = t.oid
298
- AND c.relkind IN ('r', 'v', 'm', 'f')
298
+ AND c.relkind IN ('r', 'v', 'm', 'f', 'p')
299
299
  )
300
300
  GROUP BY t.oid, t.typname, n.nspname
301
301
  ORDER BY n.nspname, t.typname
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "relq",
3
- "version": "1.0.98",
3
+ "version": "1.0.100",
4
4
  "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
5
5
  "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
6
6
  "license": "MIT",