Refine DBSQLParameter class (#190)

Signed-off-by: Levko Kravets <levko.ne@gmail.com>

Author: kravets-levko

lib/DBSQLParameter.ts

@@ -25,6 +25,10 @@ interface DBSQLParameterOptions {
   value: DBSQLParameterValue;
 }
 
+interface ToSparkParameterOptions {
+  name?: string;
+}
+
 export class DBSQLParameter {
   public readonly type?: string;
 
@@ -35,19 +39,20 @@ export class DBSQLParameter {
     this.value = value;
   }
 
-  public toSparkParameter(): TSparkParameter {
+  public toSparkParameter({ name }: ToSparkParameterOptions = {}): TSparkParameter {
     // If VOID type was set explicitly - ignore value
     if (this.type === DBSQLParameterType.VOID) {
-      return new TSparkParameter(); // for NULL neither `type` nor `value` should be set
+      return new TSparkParameter({ name }); // for NULL neither `type` nor `value` should be set
     }
 
     // Infer NULL values
     if (this.value === undefined || this.value === null) {
-      return new TSparkParameter(); // for NULL neither `type` nor `value` should be set
+      return new TSparkParameter({ name }); // for NULL neither `type` nor `value` should be set
     }
 
     if (typeof this.value === 'boolean') {
       return new TSparkParameter({
+        name,
         type: this.type ?? DBSQLParameterType.BOOLEAN,
         value: new TSparkParameterValue({
           stringValue: this.value ? 'TRUE' : 'FALSE',
@@ -57,6 +62,7 @@ export class DBSQLParameter {
 
     if (typeof this.value === 'number') {
       return new TSparkParameter({
+        name,
         type: this.type ?? (Number.isInteger(this.value) ? DBSQLParameterType.INTEGER : DBSQLParameterType.DOUBLE),
         value: new TSparkParameterValue({
           stringValue: Number(this.value).toString(),
@@ -66,6 +72,7 @@ export class DBSQLParameter {
 
     if (this.value instanceof Int64 || typeof this.value === 'bigint') {
       return new TSparkParameter({
+        name,
         type: this.type ?? DBSQLParameterType.BIGINT,
         value: new TSparkParameterValue({
           stringValue: this.value.toString(),
@@ -75,6 +82,7 @@ export class DBSQLParameter {
 
     if (this.value instanceof Date) {
       return new TSparkParameter({
+        name,
         type: this.type ?? DBSQLParameterType.TIMESTAMP,
         value: new TSparkParameterValue({
           stringValue: this.value.toISOString(),
@@ -83,6 +91,7 @@ export class DBSQLParameter {
     }
 
     return new TSparkParameter({
+      name,
       type: this.type ?? DBSQLParameterType.STRING,
       value: new TSparkParameterValue({
         stringValue: this.value,

lib/DBSQLSession.ts

@@ -115,17 +115,14 @@ function getQueryParameters(
     for (const name of Object.keys(namedParameters)) {
       const value = namedParameters[name];
       const param = value instanceof DBSQLParameter ? value : new DBSQLParameter({ value });
-      const sparkParam = param.toSparkParameter();
-      sparkParam.name = name;
-      result.push(sparkParam);
+      result.push(param.toSparkParameter({ name }));
     }
   }
 
   if (ordinalParameters !== undefined) {
     for (const value of ordinalParameters) {
       const param = value instanceof DBSQLParameter ? value : new DBSQLParameter({ value });
-      const sparkParam = param.toSparkParameter();
-      result.push(sparkParam);
+      result.push(param.toSparkParameter());
     }
   }