mythix-orm-sql-base 1.10.0 → 1.11.0

package/lib/sql-connection-base.js

@@ -39,7 +39,7 @@ class SQLConnectionBase extends ConnectionBase {
   /// Note:
   ///   This method escapes "values" that are given in
   ///   the underlying query language of the database.
-  ///   To escape identifiers, use the <see>ConnectionBase._escapeID</see>
+  ///   To escape identifiers, use the [ConnectionBase._escapeID](https://github.com/th317erd/mythix-orm/wiki/ConnectionBase#method-_escapeID)
   ///   instead.
   ///
   /// Return: string
@@ -133,16 +133,19 @@ class SQLConnectionBase extends ConnectionBase {
     return `SP${id}`;
   }
 
-  /// Given a `Map` from a projection field-set, find all matching
+  /// Given a `Map` or an `Array` from a projection field-set, find all matching
   /// projected fields through this connection, and return
   /// them as an array.
   ///
   /// Arguments:
-  ///   projectionFieldMap: Map<string, string>
-  ///     A set of projected fields, as a `Map`. This `Map` will usually be generated
+  ///   projectionFieldMap: Map<string, string> | Array<string>
+  ///     A set of projected fields, as a `Map` or an `Array`. A `Map` type will usually be generated
   ///     by <see>SQLQueryGeneratorBase.getProjectedFields</see>. The `Map` is expected
   ///     to have fully qualified field names and expanded literal strings as keys, with
-  ///     the projected database field (or literal) in database format for values.
+  ///     the projected database fields (or literals) in database format for values. As
+  ///     an `Array` type, this should be a list of fully qualified field names, or expanded
+  ///     literals as values. An `Array` of field names is generally used when the `columns`
+  ///     from the database result are passed into this method.
   ///
   /// Return: Array<[Field](https://github.com/th317erd/mythix-orm/wiki/Field) | string>
   ///   All fields found from the projection `Map`. Any field that wasn't able to be
@@ -845,6 +848,10 @@ class SQLConnectionBase extends ConnectionBase {
 
     let batchSize   = options.batchSize || 500;
     let startIndex  = queryContext.offset || 0;
+    let limit       = queryContext.limit;
+
+    if (Nife.instanceOf(limit, 'number') && isFinite(limit) && limit < batchSize)
+      batchSize = limit;
 
     while (true) {
       let query         = queryEngine.clone().LIMIT(batchSize).OFFSET(startIndex);

package/lib/sql-query-generator-base.d.ts

@@ -55,7 +55,6 @@ declare class SQLQueryGeneratorBase extends QueryGeneratorBase {
   public getEscapedTableName(modelOrField: ModelClass | Field, options?: GetEscapedTableNameNameOptions): string;
   public getEscapedProjectionName(Model: ModelClass | null | undefined, field: Field, options?: GetEscapedProjectionNameOptions): string;
   public getEscapedModelFields(Model: ModelClass, options?: GetEscapedModelFieldsOptions): { [key: string]: string };
-  public isFieldIdentifier(value: string): boolean;
   public getProjectedFields(queryEngine: QueryEngine, options?: GenericObject, asMap?: false | undefined): Array<string>;
   public getProjectedFields(queryEngine: QueryEngine, options?: GenericObject, asMap?: true): Map<string, string>;
 
@@ -67,21 +66,13 @@ declare class SQLQueryGeneratorBase extends QueryGeneratorBase {
   ): JoinTableInfo;
 
   public prepareArrayValuesForSQL(array: Array<any>): Array<any>;
-  public parseFieldProjection(value: string, getRawField: boolean): string | Field | undefined;
-  public parseFieldProjectionToFieldMap(selectStatement: string): Map<string, Field | string>;
 
   public generateSelectQueryFieldProjection(
     queryEngine: QueryEngine,
     options?: GenericObject,
-    asMap?: false | undefined,
+    projectedFields?: Map<string, string>,
   ): Array<string>;
 
-  public generateSelectQueryFieldProjection(
-    queryEngine: QueryEngine,
-    options?: GenericObject,
-    asMap?: true,
-  ): Map<string, string>;
-
   public generateSelectQueryOperatorFromQueryEngineOperator(
     queryPart: GenericObject,
     operator: string | LiteralBase,
@@ -174,7 +165,7 @@ declare class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
   public generateInsertStatementTail(
     Model: ModelClass,
-    model: Model,
+    models: Model | Array<Model> | PreparedModels,
     options: GenericObject,
     context: {
       escapedTableName: string,
@@ -225,9 +216,9 @@ declare class SQLQueryGeneratorBase extends QueryGeneratorBase {
   public generateAddColumnStatement(field: Field, options?: GenericObject): string;
 
   public _collectRemoteReturningFields(Model: ModelClass): Array<string>;
-  public _collectReturningFields(
+  public generateReturningClause(
     Model: ModelClass,
-    model: Model,
+    models: Model | Array<Model> | PreparedModels,
     options: GenericObject,
     context: {
       escapedTableName: string,