fix type for name

denakol · Aug 31, 2020 · 9a959f6 · 9a959f6
1 parent 81750b3
commit 9a959f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/api/package.json b/api/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "apollo-server": "^2.16.1",
     "graphql": "^15.3.0",
-    "mysql": "^2.14.1",
+    "mysql": "^2.18.1",
     "reflect-metadata": "^0.1.10",
     "ts-node": "^9.0.0",
     "typeorm": "0.2.25",

diff --git a/api/src/createFirstConnection.ts b/api/src/createFirstConnection.ts
@@ -5,16 +5,16 @@ async function createFirstConnection(): Promise<{
   connection: Connection | null
   exception?: Error
 }> {
-  let i = 20
+  let i = 10
   let lastException = null
   while (i > 0) {
     try {
       return { connection: await createConnection() }
     } catch (ex) {
       lastException = ex
       i--
+      await sleep(5000)
     }
-    await sleep(5000)
   }
   return {
     connection: null,

diff --git a/api/src/data/entity/Clothes.ts b/api/src/data/entity/Clothes.ts
@@ -5,7 +5,7 @@ export class Clothes {
   @PrimaryGeneratedColumn('uuid')
   id: string
 
-  @Column({ default: '', nullable: true, type: 'nvarchar' })
+  @Column({ default: '', nullable: true, charset: 'utf8' })
   name: string
 
   @Column()

diff --git a/api/yarn.lock b/api/yarn.lock
@@ -3818,7 +3818,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-mysql@^2.14.1:
+mysql@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717"
   integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==
@@ -5152,7 +5152,7 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-[email protected]:
+typeorm@^0.2.25:
   version "0.2.25"
   resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.25.tgz#1a33513b375b78cc7740d2405202208b918d7dde"
   integrity sha512-yzQ995fyDy5wolSLK9cmjUNcmQdixaeEm2TnXB5HN++uKbs9TiR6Y7eYAHpDlAE8s9J1uniDBgytecCZVFergQ==