diff --git a/flexiapi/database/migrations/2014_10_12_000000_create_users_table.php b/flexiapi/database/migrations/2014_10_12_000000_create_users_table.php
index 5e8f91d..396a348 100644
--- a/flexiapi/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/flexiapi/database/migrations/2014_10_12_000000_create_users_table.php
@@ -9,9 +9,9 @@ class CreateUsersTable extends Migration
public function up()
{
Schema::connection('local')->create('users', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->string('name');
- $table->string('email')->unique();
+ $table->string('email', 160)->unique(); // Because we (still) need to support MySQL 5.5 and its 767 bytes limit ¯\_(ツ)_/¯
$table->timestamp('email_verified_at')->nullable();
$table->string('password');
$table->rememberToken();
diff --git a/flexiapi/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/flexiapi/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
index b1b0871..695ad66 100644
--- a/flexiapi/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
+++ b/flexiapi/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -26,7 +26,7 @@ class CreateFailedJobsTable extends Migration
public function up()
{
Schema::connection('local')->create('failed_jobs', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->text('connection');
$table->text('queue');
$table->longText('payload');
diff --git a/flexiapi/database/migrations/2020_01_23_125119_create_accounts_passwords_tables.php b/flexiapi/database/migrations/2020_01_23_125119_create_accounts_passwords_tables.php
index dd60e3c..388c011 100644
--- a/flexiapi/database/migrations/2020_01_23_125119_create_accounts_passwords_tables.php
+++ b/flexiapi/database/migrations/2020_01_23_125119_create_accounts_passwords_tables.php
@@ -27,7 +27,7 @@ class CreateAccountsPasswordsTables extends Migration
{
if (!Schema::connection('external')->hasTable('accounts')) {
Schema::connection('external')->create('accounts', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->string('username', 64);
$table->string('domain', 64);
$table->string('email', 64)->nullable();
@@ -43,13 +43,13 @@ class CreateAccountsPasswordsTables extends Migration
if (!Schema::connection('external')->hasTable('passwords')) {
Schema::connection('external')->create('passwords', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned();
$table->string('password', 255);
$table->string('algorithm', 10)->default('MD5');
- //$table->foreign('account_id')->references('id')
- // ->on('accounts')->onDelete('cascade');
+ $table->foreign('account_id')->references('id')
+ ->on('accounts')->onDelete('cascade');
$table->timestamps();
});
diff --git a/flexiapi/database/migrations/2020_01_28_100553_create_nonces_digest_table.php b/flexiapi/database/migrations/2020_01_28_100553_create_nonces_digest_table.php
index f273d09..c211d73 100644
--- a/flexiapi/database/migrations/2020_01_28_100553_create_nonces_digest_table.php
+++ b/flexiapi/database/migrations/2020_01_28_100553_create_nonces_digest_table.php
@@ -26,11 +26,14 @@ class CreateNoncesDigestTable extends Migration
public function up()
{
Schema::connection('local')->create('nonces', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned();
$table->string('nonce');
$table->integer('nc')->default(0);
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
diff --git a/flexiapi/database/migrations/2020_04_29_131330_create_admins_table.php b/flexiapi/database/migrations/2020_04_29_131330_create_admins_table.php
index 2b5badb..70a7367 100644
--- a/flexiapi/database/migrations/2020_04_29_131330_create_admins_table.php
+++ b/flexiapi/database/migrations/2020_04_29_131330_create_admins_table.php
@@ -26,9 +26,12 @@ class CreateAdminsTable extends Migration
public function up()
{
Schema::connection('local')->create('admins', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned();
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
diff --git a/flexiapi/database/migrations/2020_09_14_120448_add_email_changed_table.php b/flexiapi/database/migrations/2020_09_14_120448_add_email_changed_table.php
index a681d31..a10dc52 100644
--- a/flexiapi/database/migrations/2020_09_14_120448_add_email_changed_table.php
+++ b/flexiapi/database/migrations/2020_09_14_120448_add_email_changed_table.php
@@ -26,11 +26,14 @@ class AddEmailChangedTable extends Migration
public function up()
{
Schema::connection('local')->create('email_changed', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned()->unique();
$table->string('new_email');
$table->string('hash');
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
diff --git a/flexiapi/database/migrations/2020_10_19_085412_create_api_keys_table.php b/flexiapi/database/migrations/2020_10_19_085412_create_api_keys_table.php
index 28f45a4..613a78d 100644
--- a/flexiapi/database/migrations/2020_10_19_085412_create_api_keys_table.php
+++ b/flexiapi/database/migrations/2020_10_19_085412_create_api_keys_table.php
@@ -26,15 +26,18 @@ class CreateApiKeysTable extends Migration
public function up()
{
Schema::connection('local')->create('api_keys', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned()->unique();
- $table->string('key')->unique();
+ $table->string('key', 160)->unique(); // MySQL 5.5 limit…
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
public function down()
{
- Schema::dropIfExists('api_keys');
+ Schema::connection('local')->dropIfExists('api_keys');
}
}
diff --git a/flexiapi/database/migrations/2020_11_30_123051_create_aliases_table.php b/flexiapi/database/migrations/2020_11_30_123051_create_aliases_table.php
index 0b4316f..d329d41 100644
--- a/flexiapi/database/migrations/2020_11_30_123051_create_aliases_table.php
+++ b/flexiapi/database/migrations/2020_11_30_123051_create_aliases_table.php
@@ -17,7 +17,7 @@ class CreateAliasesTable extends Migration
$table->string('domain', 64);
$table->foreign('account_id')->references('id')
- ->on('accounts')->onDelete('cascade');
+ ->on('accounts')->onDelete('cascade');
});
}
}
diff --git a/flexiapi/database/migrations/2021_02_10_160119_add_phone_change_codes_table.php b/flexiapi/database/migrations/2021_02_10_160119_add_phone_change_codes_table.php
index 0be2a57..75002c7 100644
--- a/flexiapi/database/migrations/2021_02_10_160119_add_phone_change_codes_table.php
+++ b/flexiapi/database/migrations/2021_02_10_160119_add_phone_change_codes_table.php
@@ -9,11 +9,14 @@ class AddPhoneChangeCodesTable extends Migration
public function up()
{
Schema::connection('local')->create('phone_change_codes', function (Blueprint $table) {
- $table->bigIncrements('id');
+ $table->increments('id');
$table->integer('account_id')->unsigned();
$table->string('code');
$table->string('phone');
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
diff --git a/flexiapi/database/migrations/2021_03_02_151353_create_activation_expirations_table.php b/flexiapi/database/migrations/2021_03_02_151353_create_activation_expirations_table.php
index e72a770..483b9c2 100644
--- a/flexiapi/database/migrations/2021_03_02_151353_create_activation_expirations_table.php
+++ b/flexiapi/database/migrations/2021_03_02_151353_create_activation_expirations_table.php
@@ -13,6 +13,9 @@ class CreateActivationExpirationsTable extends Migration
$table->integer('account_id')->unsigned();
$table->dateTime('expires');
$table->timestamps();
+
+ //$table->foreign('account_id')->references('id')
+ // ->on('accounts')->onDelete('cascade');
});
}
diff --git a/flexiapi/phpunit.xml b/flexiapi/phpunit.xml
index 362b3c9..53d9839 100644
--- a/flexiapi/phpunit.xml
+++ b/flexiapi/phpunit.xml
@@ -17,8 +17,6 @@
-
-
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 6167f8e..788bca9 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -8,7 +8,7 @@
#%define _datadir %{_datarootdir}
#%define _docdir %{_datadir}/doc
-%define build_number 71
+%define build_number 72
%define var_dir /var/opt/belledonne-communications
%define opt_dir /opt/belledonne-communications/share/flexisip-account-manager