pg-mvc-service 1.0.21 → 1.0.23

package/dist/models/SqlUtils/ValidateValueUtil.js

@@ -149,7 +149,8 @@ class ValidateValueUtil {
                     case "timestamp[]":
                         isError = this.isErrorTimestamp(v);
                         break;
-                    case "integer[]":
+                    case "integer[]": // TODO: ここ最大最小のチェックもしないと
+                    case "real[]": // TODO: ここ最大最小 + 桁数のチェックもしないと
                         isError = this.isErrorNumber(v);
                         break;
                     case "bool[]":

package/dist/models/TableModel.js

@@ -92,6 +92,9 @@ class TableModel {
             this.Offset = (value - 1) * this.PageCount;
         }
     }
+    get Client() {
+        return this.client;
+    }
     constructor(client, tableAlias) {
         this.dbName = "default";
         this.tableName = "";

package/index.d.ts

@@ -146,87 +146,6 @@ declare module 'pg-mvc-service' {
         constructor(errorId: string, message?: string);
     }
 
-    // export class TableModel {
-    //     protected readonly dbName: string;
-    //     get DbName(): string;
-    //     protected readonly tableName: string;
-    //     get TableName(): string;
-    //     protected readonly tableDescription: string;
-    //     get TableDescription(): string;
-    //     protected readonly comment: string;
-    //     get Comment(): string;
-    //     protected readonly columns: { [key: string]: TColumn };
-    //     get Columns(): { [key: string]: TColumn };
-    //     protected readonly references: Array<{table: string, columns: Array<{target: string, ref: string}>}>;
-    //     get References(): Array<{table: string, columns: Array<{target: string, ref: string}>}>;
-    //     public GetReferences(columnName: string): Array<{table: string, columns: Array<{target: string, ref: string}>}>;
-    //     get TableAlias(): string;
-    //     public IsOutputLog: boolean;
-    //     public SortKeyword: TSortKeyword;
-    //     public Offset: number;
-    //     public Limit: number;
-    //     public PageCount: number;
-    //     set OffsetPage(value: number);
-
-    //     constructor(client: Pool);
-    //     constructor(client: Pool, tableAlias: string);
-    //     constructor(client: PoolClient);
-    //     constructor(client: PoolClient, tableAlias: string);
-
-    //     public select(): void;
-    //     public select(columls: Array<string | {name: string, alias?: string, func?: TAggregateFuncType}> | '*'): void;
-    //     public select(columls: Array<string | {name: string, alias?: string, func?: TAggregateFuncType}> | '*', model: TableModel): void;
-    //     public select(columls: Array<string | {name: string, alias?: string, func?: TAggregateFuncType}> | '*', keyFormat: TKeyFormat): void;
-    //     public select(columls: Array<string | {name: string, alias?: string, func?: TAggregateFuncType}> | '*', model: TableModel, keyFormat: TKeyFormat): void;
-    //     public select(expression: string, alias: string): void;
-
-    //     public join(joinType: 'left' | 'inner', joinModel: TableModel, conditions: Array<TNestedCondition>): void;
-
-    //     public where(expression: string): void;
-    //     public where(conditions: Array<TNestedCondition>): void;
-    //     public where(left: string, operator: TOperator, right: any | TColumnInfo): void;
-    //     public where(left: TColumnInfo, operator: TOperator, right: any | TColumnInfo): void;
-
-    //     public find<T = {[key: string]: any}>(pk: {[key: string]: any}, selectColumns: Array<string> | "*" | null, selectExpressions: Array<TSelectExpression> | null, keyFormat: TKeyFormat): Promise<T | null>;
-    //     public find<T = {[key: string]: any}>(pk: {[key: string]: any}, selectColumns: Array<string> | "*" | null, selectExpressions: Array<TSelectExpression> | null): Promise<T | null>;
-    //     public find<T = {[key: string]: any}>(pk: {[key: string]: any}, selectColumns: Array<string> | "*" | null): Promise<T | null>;
-    //     public find<T = {[key: string]: any}>(pk: {[key: string]: any}): Promise<T | null>;
-
-    //     public findId<T = {[key: string]: any}>(id: any, selectColumns: Array<string> | "*" | null, selectExpressions: Array<TSelectExpression> | null, keyFormat: TKeyFormat): Promise<T | null>;
-    //     public findId<T = {[key: string]: any}>(id: any, selectColumns: Array<string> | "*" | null, selectExpressions: Array<TSelectExpression> | null): Promise<T | null>;
-    //     public findId<T = {[key: string]: any}>(id: any, selectColumns: Array<string> | "*" | null): Promise<T | null>;
-    //     public findId<T = {[key: string]: any}>(id: any): Promise<T | null>;
-
-    //     protected readonly errorMessages: Record<TColumnType | 'length' | 'null' | 'notInput', string>
-    //     protected throwValidationError(code: string, message: string): never;
-    //     protected validateOptions(options: {[key: string]: any}, isInsert: boolean) : Promise<void>;
-    //     protected validateInsert(options: {[key: string]: any}) : Promise<void>;
-    //     protected validateUpdate(options: {[key: string]: any}) : Promise<void>;
-    //     protected validateUpdateId(id: any, options: {[key: string]: any}) : Promise<void>;
-    //     protected validateDelete() : Promise<void>;
-    //     protected validateDeleteId(id: any) : Promise<void>;
-
-    //     public executeInsert(options: {[key: string]: any}) : Promise<void>;
-    //     public executeUpdate(options: {[key: string]: any}) : Promise<number>;
-    //     public executeUpdateId(id: any, options: {[key: string]: any}) : Promise<void>;
-    //     public executeDelete() : Promise<number>;
-    //     public executeDeleteId(id: any) : Promise<void>;
-
-    //     public executeSelect<T = {[key: string]: any}>(): Promise<Array<T>>;
-    //     public executeSelectWithCount<T = any>(): Promise<{ datas: Array<T>, count: number, lastPage: number}>;
-
-    //     protected executeQuery(param1: string, vars?: Array<any>) : Promise<any>;
-    //     protected executeQuery(param1: TQuery) : Promise<any>;
-
-    //     public orderBy(column: string | TColumnInfo, sortKeyword: TSortKeyword): void;
-    //     public orderByList(column: string | TColumnInfo, list: Array<string | number | boolean | null>, sortKeyword: TSortKeyword): void;
-    //     public orderBySentence(query: string, sortKeyword: TSortKeyword): void;
-
-    //     public groupBy(column: string | TColumnInfo): void;
-
-    //     get ValidateClient(): ValidateClient;
-    // }
-
     export function createTableDoc(models: Array<TableModel>, serviceName?: string): string;
     export function migrate(migrates: Array<MigrateTable>, poolParam: {
         host: string, user: string, dbName: string, password: string, port?: number, isSsl?: boolean

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/models/SqlUtils/ValidateValueUtil.ts

@@ -162,7 +162,8 @@ export default class ValidateValueUtil {
                     case "timestamp[]":
                         isError = this.isErrorTimestamp(v);
                         break;
-                    case "integer[]":
+                    case "integer[]": // TODO: ここ最大最小のチェックもしないと
+                    case "real[]": // TODO: ここ最大最小 + 桁数のチェックもしないと
                         isError = this.isErrorNumber(v);
                         break;
                     case "bool[]":

package/src/models/TableModel.ts

@@ -122,6 +122,9 @@ export class TableModel {
     }
 
     private client: PoolClient | Pool;
+    get Client(): PoolClient | Pool {
+        return this.client;
+    }
     constructor(client: Pool);
     constructor(client: Pool, tableAlias: string);
     constructor(client: PoolClient);