orange-orm 4.5.3 → 4.5.5

package/docs/changelog.md

@@ -1,8 +1,12 @@
 ## Changelog
+__4.5.5__  
+Bugfix:  Parameterized queries are case sensitive on SAP ASE .  See [#123](https://github.com/alfateam/orange-orm/issues/123)  
+__4.5.4__  
+Bugfix:  hasMany relation through references relation gives empty array .  See [#122](https://github.com/alfateam/orange-orm/issues/122)  
 __4.5.3__  
 Minor improvements of types in aggregate functions.    
 __4.5.2__  
-Bugfix: Aggregate functions are not allowed on root tables .  See [#120](https://github.com/alfateam/orange-orm/issues/121)  
+Bugfix: Aggregate functions are not allowed on root tables .  See [#121](https://github.com/alfateam/orange-orm/issues/121)  
 __4.5.1__  
 Bugfix: "Changed by Other User" Error Triggered by Precision Mismatch in Numeric Column.  See [#120](https://github.com/alfateam/orange-orm/issues/120)  
 __4.5.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.3",
+  "version": "4.5.5",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/client/index.mjs

@@ -5676,7 +5676,7 @@ function requireNewJoinLeg () {
 		c.expand = relation.expand;
 
 		c.accept = function(visitor) {
-			visitor.visitJoin(c);
+			return visitor.visitJoin(c);
 		};
 
 		return c;
@@ -9853,7 +9853,7 @@ function requireNewManyLeg () {
 		var c = newOneLeg(relation);
 		c.name = relation.joinRelation.rightAlias;
 		c.accept = function(visitor) {
-			visitor.visitMany(c);
+			return visitor.visitMany(c);
 		};
 
 		c.expand = relation.expand;

package/src/map.d.ts

@@ -611,22 +611,28 @@ type AggregateStrategyBase<T> =
 		where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
 	};
 
-type FetchingStrategyBase<T> = {
+
+type FetchingStrategyBase<T, IsMany = true> = 
+{
 	[K in keyof T &
 	keyof RemoveNever<
 		AllowedColumnsAndTablesStrategy<T>
 	>]?: T[K] extends ColumnSymbols
 	? boolean
-	: boolean | FetchingStrategyBase<T[K]> | AggType<T[K]>;
-} & {
+	: boolean | FetchingStrategyBase<T[K], T[K] extends ManyRelation ? true: false> | AggType<T[K]>;
+} & 
+(IsMany extends true ? {
+	limit?: number;
+	offset?: number;
 	orderBy?:
 	| OrderBy<Extract<keyof AllowedColumns<T>, string>>[]
 	| OrderBy<Extract<keyof AllowedColumns<T>, string>>;
-	limit?: number;
-	offset?: number;
 	where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
+}
+: {
+	where?: (agg: MappedColumnsAndRelations<T>) => RawFilter;
+});
 
-};
 type ExtractAggregates<Agg> = {
 	[K in keyof Agg as
 	Required<Agg>[K] extends (agg: Aggregate<infer V>) => ColumnSymbols

package/src/mssql/pool/newGenericPool.js

@@ -21,6 +21,7 @@ function newGenericPool(connectionString, poolOptions) {
 					return cb(err, null);
 				client = _client;
 				client.poolCount = 0;
+				client.msnodesqlv8 = mssql;
 				return cb(null, client);
 			}
 		},

package/src/mssql/wrapQuery.js

@@ -8,6 +8,12 @@ function wrapQuery(connection) {
 		var params = query.parameters;
 		var sql = query.sql();
 		log.emitQuery({ sql, parameters: params });
+		const sap = connection.msnodesqlv8;
+		for (let i = 0; i < params.length; i++) {
+			const parameter = params[i];
+			if (typeof parameter === 'string')
+				params[i] = sap.VarChar(parameter);
+		}
 
 		runOriginalQuery.call(connection, sql, params, onInnerCompleted);
 		let result = [];

package/src/table/relation/newJoinLeg.js

@@ -14,7 +14,7 @@ function newLeg(relation) {
 	c.expand = relation.expand;
 
 	c.accept = function(visitor) {
-		visitor.visitJoin(c);
+		return visitor.visitJoin(c);
 	};
 
 	return c;

package/src/table/relation/newManyLeg.js

@@ -4,7 +4,7 @@ function newLeg(relation) {
 	var c = newOneLeg(relation);
 	c.name = relation.joinRelation.rightAlias;
 	c.accept = function(visitor) {
-		visitor.visitMany(c);
+		return visitor.visitMany(c);
 	};
 
 	c.expand = relation.expand;