archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

fixed compiler errors caused by typescript 2.6 upgration; version bump

Browse Source
This commit is contained in:
Umed Khudoiberdiev 2017-11-03 01:26:08 +05:00
parent a4b8fb0b4d
commit 8b537c6b44
10 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -6238,9 +6238,9 @@
"dev": true
},
"typescript": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
"integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
"integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
"dev": true
},
"uglify-js": {

4
package.json
View File

@ -1,7 +1,7 @@
{
"name": "typeorm",
"private": true,
"version": "0.1.1",
"version": "0.1.2",
"description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, WebSQL, MongoDB databases.",
"license": "MIT",
"readmeFilename": "README.md",
@ -74,7 +74,7 @@
"ts-node": "^3.3.0",
"tslint": "^5.6.0",
"tslint-stylish": "^2.1.0",
"typescript": "^2.5.3"
"typescript": "^2.6.1"
},
"dependencies": {
"app-root-path": "^2.0.1",

2
src/find-options/FindOneOptions.ts
View File

@ -33,6 +33,6 @@ export interface FindOneOptions<Entity> {
/**
* Enables or disables query result caching.
*/
cache?: boolean | number | {id: any, milisseconds: number};
cache?: boolean | number | { id: any, milliseconds: number };
}

16
src/find-options/FindOptionsUtils.ts
View File

@ -20,8 +20,8 @@ export class FindOptionsUtils {
possibleOptions.join instanceof Object ||
possibleOptions.order instanceof Object ||
(possibleOptions.cache instanceof Object ||
typeof possibleOptions.cache === "boolean" ||
typeof possibleOptions.cache === "number")
typeof possibleOptions.cache === "boolean" ||
typeof possibleOptions.cache === "number")
);
}
@ -108,7 +108,7 @@ export class FindOptionsUtils {
if (options.order)
Object.keys(options.order).forEach(key => {
const order = (options as FindOneOptions<T>).order![key as any];
const order = ((options as FindOneOptions<T>).order as any)[key as any];
switch (order) {
case 1:
qb.addOrderBy(qb.alias + "." + key, "ASC");
@ -152,8 +152,14 @@ export class FindOptionsUtils {
});
}
if (options.cache)
qb.cache(options.cache);
if (options.cache) {
if (options.cache instanceof Object) {
const cache = options.cache as { id: any, milliseconds: number };
qb.cache(cache.id, cache.milliseconds);
} else {
qb.cache(options.cache);
}
}
return qb;
}

1
src/repository/BaseEntity.ts
View File

@ -21,6 +21,7 @@ export class BaseEntity {
/**
* Connection used in all static methods of the BaseEntity.
*/
// @ts-ignore: Unused variable which is actually used
private static usedConnection?: Connection;
// -------------------------------------------------------------------------

3
test/functional/connection/connection.ts
View File

@ -83,10 +83,9 @@ describe("Connection", () => {
});
describe.skip("establishing connection", function() {
let connection: Connection;
it("should throw DriverOptionNotSetError when extra.socketPath and host is missing", function() {
expect(() => {
connection = getConnectionManager().create(<ConnectionOptions>{
getConnectionManager().create(<ConnectionOptions>{
type: "mysql",
username: "test",
password: "test",

4
test/github-issues/114/issue-114.ts
View File

@ -1,18 +1,16 @@
import "reflect-metadata";
import {PostgresDriver} from "../../../src/driver/postgres/PostgresDriver";
import {expect} from "chai";
import {Connection} from "../../../src/connection/Connection";
import {PostgresConnectionOptions} from "../../../src/driver/postgres/PostgresConnectionOptions";
describe.skip("github issues > #114 Can not be parsed correctly the URL of pg.", () => {
let driver: PostgresDriver, connection: Connection;
let connection: Connection;
before(() => {
connection = new Connection({
type: "postgres",
url: "postgres://test:test@localhost:5432/test",
});
driver = new PostgresDriver(connection);
});
it("should not fail in url parser", () => {

6
test/integration/sample2-one-to-one.ts
View File

@ -323,7 +323,7 @@ describe("one-to-one", function() {
});
describe("cascade updates should be executed when cascadeUpdate option is set", function() {
let newPost: Post, newImage: PostImage, savedImage: PostImage;
let newPost: Post, newImage: PostImage;
before(reloadDatabase);
@ -339,7 +339,6 @@ describe("one-to-one", function() {
return postImageRepository
.save(newImage)
.then(image => {
savedImage = image as PostImage;
newPost.image = image as PostImage;
return postRepository.save(newPost);
@ -372,7 +371,7 @@ describe("one-to-one", function() {
});
describe("cascade remove should be executed when cascadeRemove option is set", function() {
let newPost: Post, newMetadata: PostMetadata, savedMetadata: PostMetadata;
let newPost: Post, newMetadata: PostMetadata;
before(reloadDatabase);
@ -388,7 +387,6 @@ describe("one-to-one", function() {
return postMetadataRepository
.save(newMetadata)
.then(metadata => {
savedMetadata = metadata as PostMetadata;
newPost.metadata = metadata as PostMetadata;
return postRepository.save(newPost);

6
test/integration/sample3-many-to-one.ts
View File

@ -324,7 +324,7 @@ describe("many-to-one", function() {
});
describe("cascade updates should be executed when cascadeUpdate option is set", function() {
let newPost: Post, newImage: PostImage, savedImage: PostImage;
let newPost: Post, newImage: PostImage;
before(reloadDatabase);
@ -340,7 +340,6 @@ describe("many-to-one", function() {
return postImageRepository
.save(newImage)
.then(image => {
savedImage = image as PostImage;
newPost.image = image as PostImage;
return postRepository.save(newPost);
@ -373,7 +372,7 @@ describe("many-to-one", function() {
});
describe("cascade remove should be executed when cascadeRemove option is set", function() {
let newPost: Post, newMetadata: PostMetadata, savedMetadata: PostMetadata;
let newPost: Post, newMetadata: PostMetadata;
before(reloadDatabase);
@ -389,7 +388,6 @@ describe("many-to-one", function() {
return postMetadataRepository
.save(newMetadata)
.then(metadata => {
savedMetadata = metadata as PostMetadata;
newPost.metadata = metadata as PostMetadata;
return postRepository.save(newPost);

6
test/integration/sample4-many-to-many.ts
View File

@ -339,7 +339,7 @@ describe("many-to-many", function() {
});
describe("cascade updates should be executed when cascadeUpdate option is set", function() {
let newPost: Post, newImage: PostImage, savedImage: PostImage;
let newPost: Post, newImage: PostImage;
before(reloadDatabase);
@ -355,7 +355,6 @@ describe("many-to-many", function() {
return postImageRepository
.save(newImage)
.then(image => {
savedImage = image as PostImage;
newPost.images = [];
newPost.images.push(image as PostImage);
return postRepository.save(newPost);
@ -389,7 +388,7 @@ describe("many-to-many", function() {
});
describe("cascade remove should be executed when cascadeRemove option is set", function() {
let newPost: Post, newMetadata: PostMetadata, savedMetadata: PostMetadata;
let newPost: Post, newMetadata: PostMetadata;
before(reloadDatabase);
@ -405,7 +404,6 @@ describe("many-to-many", function() {
return postMetadataRepository
.save(newMetadata)
.then(metadata => {
savedMetadata = metadata as PostMetadata;
newPost.metadatas = [];
newPost.metadatas.push(metadata as PostMetadata);
return postRepository.save(newPost);