jinaga-server 2.1.8 → 2.3.0

package/src/postgres/specification-result-sql.ts

@@ -217,7 +217,7 @@ class QueryDescription {
         return this.outputs.length;
     }
 
-    generateResultSqlQuery(): SpecificationSqlQuery {
+    generateResultSqlQuery(schema: string): SpecificationSqlQuery {
         const columns = this.outputs
             .map(output => `f${output.factIndex}.hash as hash${output.factIndex}, f${output.factIndex}.fact_id as id${output.factIndex}, f${output.factIndex}.data as data${output.factIndex}`)
             .join(", ");
@@ -226,17 +226,17 @@ class QueryDescription {
         const successorFact = this.inputs.find(i => i.factIndex === firstEdge.successorFactIndex);
         const firstFactIndex = predecessorFact ? predecessorFact.factIndex : successorFact!.factIndex;
         const writtenFactIndexes = new Set<number>().add(firstFactIndex);
-        const joins: string[] = generateJoins(this.edges, writtenFactIndexes);
+        const joins: string[] = generateJoins(this.edges, writtenFactIndexes, schema);
         const inputWhereClauses = this.inputs
             .map(input => `f${input.factIndex}.fact_type_id = $${input.factTypeParameter} AND f${input.factIndex}.hash = $${input.factHashParameter}`)
             .join(" AND ");
         const existentialWhereClauses = this.existentialConditions
-            .map(existentialCondition => ` AND ${existentialCondition.exists ? "EXISTS" : "NOT EXISTS"} (${generateExistentialWhereClause(existentialCondition, writtenFactIndexes)})`)
+            .map(existentialCondition => ` AND ${existentialCondition.exists ? "EXISTS" : "NOT EXISTS"} (${generateExistentialWhereClause(existentialCondition, writtenFactIndexes, schema)})`)
             .join("");
         const orderByClause = this.outputs
             .map(output => `f${output.factIndex}.fact_id ASC`)
             .join(", ");
-        const sql = `SELECT ${columns} FROM public.fact f${firstFactIndex}${joins.join("")} WHERE ${inputWhereClauses}${existentialWhereClauses} ORDER BY ${orderByClause}`;
+        const sql = `SELECT ${columns} FROM ${schema}.fact f${firstFactIndex}${joins.join("")} WHERE ${inputWhereClauses}${existentialWhereClauses} ORDER BY ${orderByClause}`;
         return {
             sql,
             parameters: this.parameters,
@@ -322,13 +322,13 @@ function existentialsWithNewCondition(existentialConditions: ExistentialConditio
     }
 }
 
-function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>) {
+function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>, schema: string) {
     const joins: string[] = [];
     edges.forEach(edge => {
         if (writtenFactIndexes.has(edge.predecessorFactIndex)) {
             if (writtenFactIndexes.has(edge.successorFactIndex)) {
                 joins.push(
-                    ` JOIN public.edge e${edge.edgeIndex}` +
+                    ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                     ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
@@ -336,12 +336,12 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
             }
             else {
                 joins.push(
-                    ` JOIN public.edge e${edge.edgeIndex}` +
+                    ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                     ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
                 );
                 joins.push(
-                    ` JOIN public.fact f${edge.successorFactIndex}` +
+                    ` JOIN ${schema}.fact f${edge.successorFactIndex}` +
                     ` ON f${edge.successorFactIndex}.fact_id = e${edge.edgeIndex}.successor_fact_id`
                 );
                 writtenFactIndexes.add(edge.successorFactIndex);
@@ -349,12 +349,12 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
         }
         else if (writtenFactIndexes.has(edge.successorFactIndex)) {
             joins.push(
-                ` JOIN public.edge e${edge.edgeIndex}` +
+                ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                 ` ON e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
                 ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
             );
             joins.push(
-                ` JOIN public.fact f${edge.predecessorFactIndex}` +
+                ` JOIN ${schema}.fact f${edge.predecessorFactIndex}` +
                 ` ON f${edge.predecessorFactIndex}.fact_id = e${edge.edgeIndex}.predecessor_fact_id`
             );
             writtenFactIndexes.add(edge.predecessorFactIndex);
@@ -366,7 +366,7 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
     return joins;
 }
 
-function generateExistentialWhereClause(existentialCondition: ExistentialConditionDescription, outerFactIndexes: Set<number>): string {
+function generateExistentialWhereClause(existentialCondition: ExistentialConditionDescription, outerFactIndexes: Set<number>, schema: string): string {
     const firstEdge = existentialCondition.edges[0];
     const writtenFactIndexes = new Set<number>(outerFactIndexes);
     const firstJoin: string[] = [];
@@ -381,7 +381,7 @@ function generateExistentialWhereClause(existentialCondition: ExistentialConditi
                 ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`
             );
             firstJoin.push(
-                ` JOIN public.fact f${firstEdge.successorFactIndex}` +
+                ` JOIN ${schema}.fact f${firstEdge.successorFactIndex}` +
                 ` ON f${firstEdge.successorFactIndex}.fact_id = e${firstEdge.edgeIndex}.successor_fact_id`
             );
             writtenFactIndexes.add(firstEdge.successorFactIndex);
@@ -393,7 +393,7 @@ function generateExistentialWhereClause(existentialCondition: ExistentialConditi
             ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`
         );
         firstJoin.push(
-            ` JOIN public.fact f${firstEdge.predecessorFactIndex}` +
+            ` JOIN ${schema}.fact f${firstEdge.predecessorFactIndex}` +
             ` ON f${firstEdge.predecessorFactIndex}.fact_id = e${firstEdge.edgeIndex}.predecessor_fact_id`
         );
         writtenFactIndexes.add(firstEdge.predecessorFactIndex);
@@ -401,15 +401,15 @@ function generateExistentialWhereClause(existentialCondition: ExistentialConditi
     else {
         throw new Error("Neither predecessor nor successor fact has been written");
     }
-    const tailJoins: string[] = generateJoins(existentialCondition.edges.slice(1), writtenFactIndexes);
+    const tailJoins: string[] = generateJoins(existentialCondition.edges.slice(1), writtenFactIndexes, schema);
     const joins = firstJoin.concat(tailJoins);
     const inputWhereClauses = existentialCondition.inputs
         .map(input => ` AND f${input.factIndex}.fact_type_id = $${input.factTypeParameter} AND f${input.factIndex}.hash = $${input.factHashParameter}`)
         .join("");
     const existentialWhereClauses = existentialCondition.existentialConditions
-        .map(e => ` AND ${e.exists ? "EXISTS" : "NOT EXISTS"} (${generateExistentialWhereClause(e, writtenFactIndexes)})`)
+        .map(e => ` AND ${e.exists ? "EXISTS" : "NOT EXISTS"} (${generateExistentialWhereClause(e, writtenFactIndexes, schema)})`)
         .join("");
-return `SELECT 1 FROM public.edge e${firstEdge.edgeIndex}${joins.join("")} WHERE ${whereClause.join(" AND ")}${inputWhereClauses}${existentialWhereClauses}`;
+    return `SELECT 1 FROM ${schema}.edge e${firstEdge.edgeIndex}${joins.join("")} WHERE ${whereClause.join(" AND ")}${inputWhereClauses}${existentialWhereClauses}`;
 }
 
 type FactByLabel = {
@@ -868,24 +868,24 @@ function idsEqual(a: number[], b: number[]) {
     return a.every((value, index) => value === b[index]);
 }
 
-export function resultSqlFromSpecification(start: FactReference[], specification: Specification, factTypes: FactTypeMap, roleMap: RoleMap): ResultComposer | null {
+export function resultSqlFromSpecification(start: FactReference[], specification: Specification, factTypes: FactTypeMap, roleMap: RoleMap, schema: string): ResultComposer | null {
     const descriptionBuilder = new ResultDescriptionBuilder(factTypes, roleMap);
     const description = descriptionBuilder.buildDescription(start, specification);
 
     if (!description.queryDescription.isSatisfiable()) {
         return null;
     }
-    return createResultComposer(description, 0);
+    return createResultComposer(description, 0, schema);
 }
 
-function createResultComposer(description: ResultDescription, parentFactIdLength: number): ResultComposer {
-    const sqlQuery = description.queryDescription.generateResultSqlQuery();
+function createResultComposer(description: ResultDescription, parentFactIdLength: number, schema: string): ResultComposer {
+    const sqlQuery = description.queryDescription.generateResultSqlQuery(schema);
     const resultProjection = description.resultProjection;
     const childResultComposers = description.childResultDescriptions
         .filter(child => child.queryDescription.isSatisfiable())
         .map(child => ({
             name: child.name,
-            resultComposer: createResultComposer(child, description.queryDescription.outputLength())
+            resultComposer: createResultComposer(child, description.queryDescription.outputLength(), schema)
         }));
     return new ResultComposer(sqlQuery, resultProjection, parentFactIdLength, childResultComposers);
 }

package/src/postgres/specification-sql.ts

@@ -53,7 +53,7 @@ class QueryDescription {
         private readonly notExistsConditions: NotExistsConditionDescription[] = []
     ) {}
 
-    generateSqlQuery(bookmark: string, limit: number): SpecificationSqlQuery {
+    generateSqlQuery(schema: string, bookmark: string, limit: number): SpecificationSqlQuery {
         const hashes = this.outputs
             .map(output => `f${output.factIndex}.hash as hash${output.factIndex}`)
             .join(", ");
@@ -65,17 +65,17 @@ class QueryDescription {
         const successorFact = this.inputs.find(i => i.factIndex === firstEdge.successorFactIndex);
         const firstFactIndex = predecessorFact ? predecessorFact.factIndex : successorFact!.factIndex;
         const writtenFactIndexes = new Set<number>().add(firstFactIndex);
-        const joins: string[] = generateJoins(this.edges, writtenFactIndexes);
+        const joins: string[] = generateJoins(schema, this.edges, writtenFactIndexes);
         const inputWhereClauses = this.inputs
             .filter(input => input.factTypeParameter !== 0)
             .map(input => `f${input.factIndex}.fact_type_id = $${input.factTypeParameter} AND f${input.factIndex}.hash = $${input.factHashParameter}`)
             .join(" AND ");
         const notExistsWhereClauses = this.notExistsConditions
-            .map(notExistsWhereClause => ` AND NOT EXISTS (${generateNotExistsWhereClause(notExistsWhereClause, writtenFactIndexes)})`)
+            .map(notExistsWhereClause => ` AND NOT EXISTS (${generateNotExistsWhereClause(schema, notExistsWhereClause, writtenFactIndexes)})`)
             .join("");
         const bookmarkParameter = this.parameters.length + 1;
         const limitParameter = bookmarkParameter + 1;
-        const sql = `SELECT ${hashes}, sort(array[${factIds}], 'desc') as bookmark FROM public.fact f${firstFactIndex}${joins.join("")} WHERE ${inputWhereClauses}${notExistsWhereClauses} AND sort(array[${factIds}], 'desc') > $${bookmarkParameter} ORDER BY bookmark ASC LIMIT $${limitParameter}`;
+        const sql = `SELECT ${hashes}, sort(array[${factIds}], 'desc') as bookmark FROM ${schema}.fact f${firstFactIndex}${joins.join("")} WHERE ${inputWhereClauses}${notExistsWhereClauses} AND sort(array[${factIds}], 'desc') > $${bookmarkParameter} ORDER BY bookmark ASC LIMIT $${limitParameter}`;
         const bookmarkValue: number[] = parseBookmark(bookmark);
         return {
             sql,
@@ -89,13 +89,13 @@ class QueryDescription {
     }
 }
 
-function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>) {
+function generateJoins(schema: string, edges: EdgeDescription[], writtenFactIndexes: Set<number>) {
     const joins: string[] = [];
     edges.forEach(edge => {
         if (writtenFactIndexes.has(edge.predecessorFactIndex)) {
             if (writtenFactIndexes.has(edge.successorFactIndex)) {
                 joins.push(
-                    ` JOIN public.edge e${edge.edgeIndex}` +
+                    ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                     ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
@@ -103,12 +103,12 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
             }
             else {
                 joins.push(
-                    ` JOIN public.edge e${edge.edgeIndex}` +
+                    ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                     ` ON e${edge.edgeIndex}.predecessor_fact_id = f${edge.predecessorFactIndex}.fact_id` +
                     ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
                 );
                 joins.push(
-                    ` JOIN public.fact f${edge.successorFactIndex}` +
+                    ` JOIN ${schema}.fact f${edge.successorFactIndex}` +
                     ` ON f${edge.successorFactIndex}.fact_id = e${edge.edgeIndex}.successor_fact_id`
                 );
                 writtenFactIndexes.add(edge.successorFactIndex);
@@ -116,12 +116,12 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
         }
         else if (writtenFactIndexes.has(edge.successorFactIndex)) {
             joins.push(
-                ` JOIN public.edge e${edge.edgeIndex}` +
+                ` JOIN ${schema}.edge e${edge.edgeIndex}` +
                 ` ON e${edge.edgeIndex}.successor_fact_id = f${edge.successorFactIndex}.fact_id` +
                 ` AND e${edge.edgeIndex}.role_id = $${edge.roleParameter}`
             );
             joins.push(
-                ` JOIN public.fact f${edge.predecessorFactIndex}` +
+                ` JOIN ${schema}.fact f${edge.predecessorFactIndex}` +
                 ` ON f${edge.predecessorFactIndex}.fact_id = e${edge.edgeIndex}.predecessor_fact_id`
             );
             writtenFactIndexes.add(edge.predecessorFactIndex);
@@ -133,7 +133,7 @@ function generateJoins(edges: EdgeDescription[], writtenFactIndexes: Set<number>
     return joins;
 }
 
-function generateNotExistsWhereClause(notExistsWhereClause: NotExistsConditionDescription, outerFactIndexes: Set<number>): string {
+function generateNotExistsWhereClause(schema: string, notExistsWhereClause: NotExistsConditionDescription, outerFactIndexes: Set<number>): string {
     const firstEdge = notExistsWhereClause.edges[0];
     const writtenFactIndexes = new Set<number>(outerFactIndexes);
     const firstJoin: string[] = [];
@@ -148,7 +148,7 @@ function generateNotExistsWhereClause(notExistsWhereClause: NotExistsConditionDe
                 ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`
             );
             firstJoin.push(
-                ` JOIN public.fact f${firstEdge.successorFactIndex}` +
+                ` JOIN ${schema}.fact f${firstEdge.successorFactIndex}` +
                 ` ON f${firstEdge.successorFactIndex}.fact_id = e${firstEdge.edgeIndex}.successor_fact_id`
             );
             writtenFactIndexes.add(firstEdge.successorFactIndex);
@@ -160,7 +160,7 @@ function generateNotExistsWhereClause(notExistsWhereClause: NotExistsConditionDe
             ` AND e${firstEdge.edgeIndex}.role_id = $${firstEdge.roleParameter}`
         );
         firstJoin.push(
-            ` JOIN public.fact f${firstEdge.predecessorFactIndex}` +
+            ` JOIN ${schema}.fact f${firstEdge.predecessorFactIndex}` +
             ` ON f${firstEdge.predecessorFactIndex}.fact_id = e${firstEdge.edgeIndex}.predecessor_fact_id`
         );
         writtenFactIndexes.add(firstEdge.predecessorFactIndex);
@@ -168,9 +168,9 @@ function generateNotExistsWhereClause(notExistsWhereClause: NotExistsConditionDe
     else {
         throw new Error("Neither predecessor nor successor fact has been written");
     }
-    const tailJoins: string[] = generateJoins(notExistsWhereClause.edges.slice(1), writtenFactIndexes);
+    const tailJoins: string[] = generateJoins(schema, notExistsWhereClause.edges.slice(1), writtenFactIndexes);
     const joins = firstJoin.concat(tailJoins);
-    return `SELECT 1 FROM public.edge e${firstEdge.edgeIndex}${joins.join("")} WHERE ${whereClause.join(" AND ")}`;
+    return `SELECT 1 FROM ${schema}.edge e${firstEdge.edgeIndex}${joins.join("")} WHERE ${whereClause.join(" AND ")}`;
 }
 
 function parseBookmark(bookmark: string): number[] {
@@ -330,7 +330,7 @@ class DescriptionBuilder {
     }
 }
 
-export function sqlFromSpecification(start: FactReference[], bookmarks: string[], limit: number, specification: Specification, factTypes: Map<string, number>, roleMap: Map<number, Map<string, number>>): SpecificationSqlQuery[] {
+export function sqlFromSpecification(start: FactReference[], schema: string, bookmarks: string[], limit: number, specification: Specification, factTypes: Map<string, number>, roleMap: Map<number, Map<string, number>>): SpecificationSqlQuery[] {
     const feeds = buildFeeds(start, specification);
     const descriptionBuilder = new DescriptionBuilder(factTypes, roleMap);
     const feedAndBookmark = feeds.map((feed, index) => ({
@@ -341,18 +341,18 @@ export function sqlFromSpecification(start: FactReference[], bookmarks: string[]
         descriptionBuilder.isSatisfiable(fb.feed, fb.feed.edges));
     const sqlQueries = satisfiableFeedsAndBookmarks.map(fb => {
         const description = descriptionBuilder.buildDescription(fb.feed);
-        const sql = description.generateSqlQuery(fb.bookmark, limit);
+        const sql = description.generateSqlQuery(schema, fb.bookmark, limit);
         return sql;
     });
     return sqlQueries;
 }
 
-export function sqlFromFeed(feed: Feed, bookmark: string, limit: number, factTypes: Map<string, number>, roleMap: Map<number, Map<string, number>>): SpecificationSqlQuery | null {
+export function sqlFromFeed(feed: Feed, schema: string, bookmark: string, limit: number, factTypes: Map<string, number>, roleMap: Map<number, Map<string, number>>): SpecificationSqlQuery | null {
     const descriptionBuilder = new DescriptionBuilder(factTypes, roleMap);
     if (!descriptionBuilder.isSatisfiable(feed, feed.edges)) {
         return null;
     }
     const description = descriptionBuilder.buildDescription(feed);
-    const sql = description.generateSqlQuery(bookmark, limit);
+    const sql = description.generateSqlQuery(schema, bookmark, limit);
     return sql;
 }

package/src/postgres/sql.ts

@@ -10,10 +10,10 @@ export type SqlQuery = {
     factTypeNames: string[]
 };
 
-export function sqlFromSteps(start: FactReference, steps: Step[], factTypes: FactTypeMap, roleMap: RoleMap) : SqlQuery | null {
+export function sqlFromSteps(start: FactReference, steps: Step[], factTypes: FactTypeMap, roleMap: RoleMap, schema: string) : SqlQuery | null {
     const builder = new QueryBuilder(factTypes, roleMap);
 
-    return builder.buildQuery(start, steps);
+    return builder.buildQuery(start, steps, schema);
 }
 
 interface QueryJoinEdge {
@@ -90,7 +90,7 @@ class QueryBuilder {
     constructor(private factTypes: FactTypeMap, private roleMap: RoleMap) {
     }
 
-    buildQuery(start: FactReference, steps: Step[]): SqlQuery | null {
+    buildQuery(start: FactReference, steps: Step[], schema: string): SqlQuery | null {
         if (steps.length === 0) {
             return null;
         }
@@ -120,9 +120,9 @@ class QueryBuilder {
             .filter(j => j.table === 'fact')
             .map(j => (j as QueryJoinFact).factAlias);
         const hashes = factAliases.map(a => `f${a}.hash as hash${a}`).join(', ');
-        const joins = this.buildJoins(this.queryParts.joins, 'f1.fact_id');
-        const whereClause = this.buildWhereClause(this.queryParts.existentialClauses);
-        const sql = `SELECT ${hashes} FROM public.fact f1${joins} WHERE f1.fact_type_id = $1 AND f1.hash = $2${whereClause}`;
+        const joins = this.buildJoins(schema, this.queryParts.joins, 'f1.fact_id');
+        const whereClause = this.buildWhereClause(schema, this.queryParts.existentialClauses);
+        const sql = `SELECT ${hashes} FROM ${schema}.fact f1${joins} WHERE f1.fact_type_id = $1 AND f1.hash = $2${whereClause}`;
 
         return {
             empty: false,
@@ -133,7 +133,7 @@ class QueryBuilder {
         };
     }
 
-    private buildJoins(joins: QueryJoin[], priorFactId: string) {
+    private buildJoins(schema: string, joins: QueryJoin[], priorFactId: string) {
         interface Joins {
             priorFactId: string,
             clauses: string[]
@@ -145,7 +145,7 @@ class QueryBuilder {
         const clauses = joins.reduce((joins, join) => {
             if (join.table === 'edge') {
                 if (join.direction === 'successor') {
-                    const clause = ` JOIN public.edge e${join.edgeAlias} ` +
+                    const clause = ` JOIN ${schema}.edge e${join.edgeAlias} ` +
                         `ON e${join.edgeAlias}.predecessor_fact_id = ${joins.priorFactId} ` +
                         `AND e${join.edgeAlias}.role_id = $${join.roleParameter}`;
                     return {
@@ -154,7 +154,7 @@ class QueryBuilder {
                     };
                 }
                 else {
-                    const clause = ` JOIN public.edge e${join.edgeAlias} ` +
+                    const clause = ` JOIN ${schema}.edge e${join.edgeAlias} ` +
                         `ON e${join.edgeAlias}.successor_fact_id = ${joins.priorFactId} ` +
                         `AND e${join.edgeAlias}.role_id = $${join.roleParameter}`;
                     return {
@@ -163,7 +163,7 @@ class QueryBuilder {
                     };
                 }
             } else {
-                const clause = ` JOIN public.fact f${join.factAlias} ON f${join.factAlias}.fact_id = ${joins.priorFactId}`;
+                const clause = ` JOIN ${schema}.fact f${join.factAlias} ON f${join.factAlias}.fact_id = ${joins.priorFactId}`;
                 return {
                     priorFactId: joins.priorFactId,
                     clauses: [...joins.clauses, clause]
@@ -173,7 +173,7 @@ class QueryBuilder {
         return clauses.join('');
     }
 
-    buildWhereClause(existentialClauses: ExistentialClause[]): string {
+    buildWhereClause(schema: string, existentialClauses: ExistentialClause[]): string {
         if (existentialClauses.length === 0) {
             return '';
         }
@@ -187,12 +187,12 @@ class QueryBuilder {
             const firstTailFactId = first.direction === 'predecessor'
                 ? `e${first.edgeAlias}.successor_fact_id`
                 : `e${first.edgeAlias}.predecessor_fact_id`;
-            const joins = this.buildJoins(rest, firstHeadFactId);
+            const joins = this.buildJoins(schema, rest, firstHeadFactId);
             const priorFactId = clause.priorEdgeJoin.direction === 'predecessor'
                 ? `e${clause.priorEdgeJoin.edgeAlias}.predecessor_fact_id`
                 : `e${clause.priorEdgeJoin.edgeAlias}.successor_fact_id`;
-            const whereClause = this.buildWhereClause(clause.query.existentialClauses);
-            return ` AND ${quantifierSql} (SELECT 1 FROM public.edge e${first.edgeAlias}${joins} ` +
+            const whereClause = this.buildWhereClause(schema, clause.query.existentialClauses);
+            return ` AND ${quantifierSql} (SELECT 1 FROM ${schema}.edge e${first.edgeAlias}${joins} ` +
                 `WHERE ${firstTailFactId} = ${priorFactId} ` +
                 `AND e${first.edgeAlias}.role_id = $${first.roleParameter}${whereClause})`;
         });

package/test/postgres/postgresReadSpec.ts

@@ -43,7 +43,7 @@ function sqlFor(descriptiveString: string, bookmarks: string[] = []) {
         }
         throw new Error(`Unknown input type ${input.type}`);
     });
-    const composer = resultSqlFromSpecification(start, specification, factTypes, roleMap);
+    const composer = resultSqlFromSpecification(start, specification, factTypes, roleMap, "public");
     if (!composer) {
         throw new Error("The specification is not satisfiable.");
     }

package/test/postgres/postgresSpec.ts

@@ -27,7 +27,7 @@ describe('Postgres', () => {
     let roleMap = allRoles(query.steps, 'Root').filter(r => r.type !== 'Unknown' && r.role !== 'unknown').reduce(
       (r, role, i) => addRole(r, ensureGetFactTypeId(factTypes, role.type), role.role, i + 1),
       emptyRoleMap());
-    const sqlQuery = sqlFromSteps(start, query.steps, factTypes, roleMap);
+    const sqlQuery = sqlFromSteps(start, query.steps, factTypes, roleMap, "public");
     return sqlQuery ? { sql: sqlQuery.sql, parameters: sqlQuery.parameters, pathLength: sqlQuery.pathLength, empty: sqlQuery.empty, factTypes, roleMap } : null;
   }
 

package/test/postgres/postgresSpecificationSpec.ts

@@ -44,7 +44,7 @@ function sqlFor(descriptiveString: string, bookmarks: string[] = []) {
         }
         throw new Error(`Unknown input type ${input.type}`);
     });
-    const sqlQueries = sqlFromSpecification(start, bookmarks, 100, specification, factTypes, roleMap);
+    const sqlQueries = sqlFromSpecification(start, "public", bookmarks, 100, specification, factTypes, roleMap);
     return { sqlQueries, factTypes, roleMap };
 }
 

package/dist/http/node-http.d.ts

@@ -1,7 +0,0 @@
-import { HttpConnection, HttpResponse } from "jinaga";
-export declare class NodeHttpConnection implements HttpConnection {
-    private url;
-    constructor(url: string);
-    get(path: string): Promise<{}>;
-    post(tail: string, body: {}, timeoutSeconds: number): Promise<HttpResponse>;
-}

package/dist/http/node-http.js

@@ -1,135 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeHttpConnection = void 0;
-const http = __importStar(require("http"));
-const https = __importStar(require("https"));
-const url = __importStar(require("url"));
-class NodeHttpConnection {
-    constructor(url) {
-        this.url = url;
-    }
-    get(path) {
-        return new Promise((resolve, reject) => {
-            const { protocol } = url.parse(this.url + path);
-            const get = protocol === "https:" ? https.get : http.get;
-            let data = "";
-            get(this.url + path, response => {
-                response.on("data", chunk => {
-                    data += chunk;
-                });
-                response.on("end", () => {
-                    try {
-                        const result = JSON.parse(data);
-                        resolve(result);
-                    }
-                    catch (x) {
-                        reject(x);
-                    }
-                });
-            }).on("error", err => reject(err));
-        });
-    }
-    post(tail, body, timeoutSeconds) {
-        return new Promise((resolve, reject) => {
-            const { protocol, host, port, path } = url.parse(this.url + tail);
-            const request = protocol === "https:" ? https.request : http.request;
-            let response = "";
-            const req = request({
-                method: "POST",
-                host, port, path,
-                headers: {
-                    "Accept": "application/json",
-                    "Content-Type": "application/json"
-                },
-                timeout: timeoutSeconds * 1000
-            }, res => {
-                res.on("data", chunk => {
-                    if (chunk instanceof Buffer) {
-                        response += chunk.toString();
-                    }
-                    else {
-                        response += chunk;
-                    }
-                });
-                res.on("error", err => {
-                    resolve({
-                        result: "failure",
-                        error: err.message
-                    });
-                });
-                res.on("end", () => {
-                    if (res.statusCode === 403) {
-                        reject(response);
-                    }
-                    else if (!res.statusCode || res.statusCode >= 400) {
-                        resolve({
-                            result: "retry",
-                            error: response
-                        });
-                    }
-                    else if (res.statusCode === 201) {
-                        resolve({
-                            result: "success",
-                            response: {}
-                        });
-                    }
-                    else if (isJsonResult(res.headers["content-type"])) {
-                        try {
-                            const json = JSON.parse(response);
-                            resolve({
-                                result: "success",
-                                response: json
-                            });
-                        }
-                        catch (x) {
-                            reject(x);
-                        }
-                    }
-                    else {
-                        reject(response);
-                    }
-                });
-            });
-            req.on("error", err => {
-                resolve({
-                    result: "failure",
-                    error: err.message
-                });
-            });
-            req.write(JSON.stringify(body));
-            req.end();
-        });
-    }
-}
-exports.NodeHttpConnection = NodeHttpConnection;
-function isJsonResult(contentType) {
-    if (!contentType) {
-        return false;
-    }
-    const json = contentType.split(";").indexOf("application/json");
-    return json >= 0;
-}
-//# sourceMappingURL=node-http.js.map

package/dist/http/node-http.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"node-http.js","sourceRoot":"","sources":["../../src/http/node-http.ts"],"names":[],"mappings":"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"}