Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
AnyhowStep committed Aug 24, 2019
1 parent c67e1ce commit 6fcd75d
Show file tree
Hide file tree
Showing 41 changed files with 188 additions and 150 deletions.
4 changes: 0 additions & 4 deletions src/table/table-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ export class Table<DataT extends TableData> implements ITable {
readonly explicitDefaultValueColumns : DataT["explicitDefaultValueColumns"];
readonly mutableColumns : DataT["mutableColumns"];

readonly parents : DataT["parents"];

/**
* You should never need to explicitly instantiate a `Table`.
* Use `table()` instead.
Expand Down Expand Up @@ -74,8 +72,6 @@ export class Table<DataT extends TableData> implements ITable {
this.nullableColumns = data.nullableColumns;
this.explicitDefaultValueColumns = data.explicitDefaultValueColumns;
this.mutableColumns = data.mutableColumns;

this.parents = data.parents;
}

/**
Expand Down
11 changes: 8 additions & 3 deletions src/table/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ import {Key} from "../key";
import {AliasedTableData, IAliasedTable} from "../aliased-table";
import {Ast} from "../ast";

/**
* Does not have `parents` property.
* https://www.postgresql.org/docs/9.1/ddl-inherit.html
*
* If a DBMS supports table inheritance, they should implement it
* on their DBMS-specific repositories.
*/
export interface TableData extends AliasedTableData {
readonly autoIncrement : undefined|string;
readonly id : undefined|string;
Expand All @@ -21,8 +28,6 @@ export interface TableData extends AliasedTableData {
readonly nullableColumns : readonly string[];
readonly explicitDefaultValueColumns : readonly string[];
readonly mutableColumns : readonly string[];

readonly parents : readonly ITable[];
}

export interface ITable<DataT extends TableData=TableData> extends IAliasedTable<DataT> {
Expand Down Expand Up @@ -211,7 +216,7 @@ export interface ITable<DataT extends TableData=TableData> extends IAliasedTable
* no default | has default | The parent column must a unique key we can use to retrieve after insertion, to get the value
* no default | no default | The value must be provided, it'll set both to the value
*/
readonly parents : DataT["parents"];
//readonly parents : DataT["parents"];
}

export type InsertableTable = (
Expand Down
4 changes: 0 additions & 4 deletions src/table/util/constructor/from-table-alias.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ export type FromTableAlias<
nullableColumns : readonly [],
explicitDefaultValueColumns : readonly [],
mutableColumns : readonly [],

parents : readonly [],
}>
);
/**
Expand Down Expand Up @@ -58,8 +56,6 @@ export function fromTableAlias<
nullableColumns : [],
explicitDefaultValueColumns : [],
mutableColumns : [],

parents : [],
} as const,
escapeIdentifier(tableAlias)
);
Expand Down
4 changes: 0 additions & 4 deletions src/table/util/constructor/from-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ export type FromTable<TableT extends ITable> = (
nullableColumns : TableT["nullableColumns"],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -52,8 +50,6 @@ export function fromTable<TableT extends ITable> (
nullableColumns : TableT["nullableColumns"],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>(
table,
table.unaliasedAst
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/add-all-mutable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ export type AddAllMutable<
* All non-generated columns are now mutable.
*/
mutableColumns : readonly AddAllMutableColumnAlias<TableT>[],

parents : TableT["parents"],
}>
);

Expand Down Expand Up @@ -98,8 +96,6 @@ export function addAllMutable<
nullableColumns,
explicitDefaultValueColumns,
//mutableColumns,

parents,
} = table;


Expand All @@ -122,8 +118,6 @@ export function addAllMutable<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/add-candidate-key.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ export type AddCandidateKey<
nullableColumns : TableT["nullableColumns"],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -236,8 +234,6 @@ export function addCandidateKey<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;


Expand All @@ -260,8 +256,6 @@ export function addCandidateKey<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
2 changes: 0 additions & 2 deletions src/table/util/operation/add-columns-from-field-array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ export type AddColumnsFromFieldArray<
>[],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down
2 changes: 0 additions & 2 deletions src/table/util/operation/add-columns-from-mapper-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ export type AddColumnsFromMapperMap<
>[],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/add-explicit-default-value.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ export type AddExplicitDefaultValue<
KeyUtil.FromColumnArray<ColumnsT>
>,
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -161,8 +159,6 @@ export function addExplicitDefaultValue<
nullableColumns,
//explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;


Expand All @@ -185,8 +181,6 @@ export function addExplicitDefaultValue<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/add-generated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ export type AddGenerated<
TableT["mutableColumns"],
KeyUtil.FromColumnArray<ColumnsT>
>,

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -167,8 +165,6 @@ export function addGenerated<
nullableColumns,
//explicitDefaultValueColumns,
//mutableColumns,

parents,
} = table;


Expand All @@ -191,8 +187,6 @@ export function addGenerated<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/add-mutable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ export type AddMutable<
TableT["mutableColumns"],
KeyUtil.FromColumnArray<ColumnsT>
>,

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -139,8 +137,6 @@ export function addMutable<
nullableColumns,
explicitDefaultValueColumns,
//mutableColumns,

parents,
} = table;


Expand All @@ -163,8 +159,6 @@ export function addMutable<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
15 changes: 1 addition & 14 deletions src/table/util/operation/as.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ export type AsImpl<
NullableColumnsT extends ITable["nullableColumns"],
ExplicitDefaultValueColumnsT extends ITable["explicitDefaultValueColumns"],
MutableColumnsT extends ITable["mutableColumns"],

/**
* @todo Remove this
*/
ParentsT extends ITable["parents"]
> =
Table<{
isLateral : IsLateralT,
Expand All @@ -53,8 +48,6 @@ export type AsImpl<
nullableColumns : NullableColumnsT,
explicitDefaultValueColumns : ExplicitDefaultValueColumnsT,
mutableColumns : MutableColumnsT,

parents : ParentsT,
}>
;
export type As<TableT extends ITable, NewTableAliasT extends string> =
Expand All @@ -75,9 +68,7 @@ export type As<TableT extends ITable, NewTableAliasT extends string> =
TableT["generatedColumns"],
TableT["nullableColumns"],
TableT["explicitDefaultValueColumns"],
TableT["mutableColumns"],

TableT["parents"]
TableT["mutableColumns"]
>
;
/**
Expand Down Expand Up @@ -114,8 +105,6 @@ export function as<TableT extends ITable, NewTableAliasT extends string> (
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;

const result : As<TableT, NewTableAliasT> = new Table(
Expand All @@ -140,8 +129,6 @@ export function as<TableT extends ITable, NewTableAliasT extends string> (
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/disable-delete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ export type DisableDelete<
nullableColumns : TableT["nullableColumns"],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -61,8 +59,6 @@ export function disableDelete<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;


Expand All @@ -85,8 +81,6 @@ export function disableDelete<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/disable-insert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ export type DisableInsert<
nullableColumns : TableT["nullableColumns"],
explicitDefaultValueColumns : TableT["explicitDefaultValueColumns"],
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -61,8 +59,6 @@ export function disableInsert<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;


Expand All @@ -85,8 +81,6 @@ export function disableInsert<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/remove-all-mutable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ export type RemoveAllMutable<
* No columns are mutable
*/
mutableColumns : readonly [],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -61,8 +59,6 @@ export function removeAllMutable<
nullableColumns,
explicitDefaultValueColumns,
//mutableColumns,

parents,
} = table;


Expand All @@ -85,8 +81,6 @@ export function removeAllMutable<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
6 changes: 0 additions & 6 deletions src/table/util/operation/remove-explicit-default-value.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ export type RemoveExplicitDefaultValue<
KeyUtil.FromColumnArray<ColumnsT>
>,
mutableColumns : TableT["mutableColumns"],

parents : TableT["parents"],
}>
);
/**
Expand Down Expand Up @@ -134,8 +132,6 @@ export function removeExplicitDefaultValue<
nullableColumns,
//explicitDefaultValueColumns,
mutableColumns,

parents,
} = table;


Expand All @@ -158,8 +154,6 @@ export function removeExplicitDefaultValue<
nullableColumns,
explicitDefaultValueColumns,
mutableColumns,

parents,
},
table.unaliasedAst
);
Expand Down
Loading

0 comments on commit 6fcd75d

Please sign in to comment.