Skip to content

Commit 1568c5a

Browse files
committed
sync with java: d3ec2c31bb8774b8cf3e07b3df4a759b277da483
1 parent 06f41c6 commit 1568c5a

File tree

5 files changed

+581
-10
lines changed

5 files changed

+581
-10
lines changed

src/Documents/BulkInsertOperation.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { CommandType } from "./Commands/CommandData";
2323
import { TypeUtil } from "../Utility/TypeUtil";
2424
import { IDisposable } from "../Types/Contracts";
2525
import { TypedTimeSeriesEntry } from "./Session/TimeSeries/TypedTimeSeriesEntry";
26-
import { ClassConstructor } from "../Types";
26+
import { ClassConstructor, EntityConstructor } from "../Types";
2727
import { TimeSeriesOperations } from "./TimeSeries/TimeSeriesOperations";
2828
import { TimeSeriesValuesHelper } from "./Session/TimeSeries/TimeSeriesValuesHelper";
2929

@@ -397,18 +397,18 @@ export class BulkInsertOperation {
397397
return new BulkInsertOperation._attachmentsBulkInsertClass(this, id);
398398
}
399399

400-
public timeSeriesFor(id: string, name);
401-
public timeSeriesFor<T extends object>(clazz: ClassConstructor<T>, id: string)
402-
public timeSeriesFor<T extends object>(clazz: ClassConstructor<T>, id: string, name: string)
403-
public timeSeriesFor<T extends object>(classOrId: ClassConstructor<T> | string, idOrName: string, name?: string) {
400+
public timeSeriesFor(id: string, name): ITimeSeriesBulkInsert;
401+
public timeSeriesFor<T extends object>(clazz: EntityConstructor<T>, id: string): ITypedTimeSeriesBulkInsert<T>;
402+
public timeSeriesFor<T extends object>(clazz: EntityConstructor<T>, id: string, name: string): ITypedTimeSeriesBulkInsert<T>;
403+
public timeSeriesFor<T extends object>(classOrId: EntityConstructor<T> | string, idOrName: string, name?: string) {
404404
if (TypeUtil.isString(classOrId)) {
405405
return this._timeSeriesFor(classOrId, idOrName);
406406
} else {
407407
return this._typedTimeSeriesFor(classOrId, idOrName, name);
408408
}
409409
}
410410

411-
private _typedTimeSeriesFor<T extends object>(clazz: ClassConstructor<T>, id: string, name: string = null) {
411+
private _typedTimeSeriesFor<T extends object>(clazz: EntityConstructor<T>, id: string, name: string = null) {
412412
if (StringUtil.isNullOrEmpty(id)) {
413413
throwError("InvalidArgumentException", "Document id cannot be null or empty");
414414
}
@@ -616,7 +616,7 @@ export class BulkInsertOperation {
616616
}
617617

618618
firstValue = false;
619-
this._operation._currentWriter.push(value.toString());
619+
this._operation._currentWriter.push((value ?? 0).toString());
620620
}
621621

622622
if (tag) {

test/Ported/TimeSeries/TimeSeriesOperations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ describe("TimeSeriesOperations", function () {
848848
for (let i = 0; i <= 10; i++) {
849849
timeSeriesOp.append(
850850
new AppendOperation(
851-
baseLine.add(i * 10, "minutes").toDate(), [ 72 ], "watches/fitbit"));
851+
baseLine.clone().add(i * 10, "minutes").toDate(), [ 72 ], "watches/fitbit"));
852852
}
853853

854854
const timeSeriesBatch = new TimeSeriesBatchOperation(documentId, timeSeriesOp);

test/Ported/TimeSeries/TimeSeriesRawQuery.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ select out(p) as heartRate, p.name`, RawQueryResult)
9696

9797
it("canQueryTimeSeriesAggregation_DeclareSyntax_MultipleSeries", async () => {
9898
const baseLine = moment().startOf("day");
99-
const baseLine2 = baseLine.add(-1, "day");
99+
const baseLine2 = baseLine.clone().add(-1, "day");
100100

101101
{
102102
const session = store.openSession();

test/Ported/TimeSeries/TimeSeriesSessionTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe("TimeSeriesSessionTest", function () {
4242
assertThat(val.tag)
4343
.isEqualTo("watches/fitbit");
4444
assertThat(val.timestamp.getTime())
45-
.isEqualTo(baseLine.add(1, "minute").toDate().getTime());
45+
.isEqualTo(baseLine.clone().add(1, "minute").toDate().getTime());
4646
}
4747
});
4848

0 commit comments

Comments
 (0)