2 files changed, 8 insertions, 6 deletions

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index d95e34bce..1a9ce5a61 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -125,10 +125,11 @@ async function checkPostgresExtensions () {
 }
 
 async function createFunctions () {
-  const query = `CREATE OR REPLACE FUNCTION immutable_unaccent(varchar)
-  RETURNS text AS $$
-    SELECT unaccent($1)
-  $$ LANGUAGE sql IMMUTABLE;`
+  const query = `CREATE OR REPLACE FUNCTION immutable_unaccent(text)
+  RETURNS text AS
+$func$
+SELECT public.unaccent('public.unaccent', $1::text)
+$func$  LANGUAGE sql IMMUTABLE;`
 
   return sequelizeTypescript.query(query, { raw: true })
 }
diff --git a/server/initializers/migrations/0055-video-uuid.ts b/server/initializers/migrations/0055-video-uuid.ts
index 6db25f193..e0f904080 100644
--- a/server/initializers/migrations/0055-video-uuid.ts
+++ b/server/initializers/migrations/0055-video-uuid.ts
@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize'
 import * as Promise from 'bluebird'
+import { Migration } from '../../models/migrations'
 
 function up (utils: {
   transaction: Sequelize.Transaction,
@@ -12,7 +13,7 @@ function up (utils: {
     type: Sequelize.UUID,
     defaultValue: Sequelize.UUIDV4,
     allowNull: true
-  }
+  } as Migration.UUID
 
   return q.addColumn('Videos', 'uuid', dataUUID)
     .then(() => {
@@ -24,7 +25,7 @@ function up (utils: {
       return utils.sequelize.query(query)
     })
     .then(() => {
-      dataUUID.defaultValue = null // FIXME:default value cannot be null if string
+      dataUUID.defaultValue = null
 
       return q.changeColumn('Videos', 'uuid', dataUUID)
     })