clean up

.gitignore

@@ -1,3 +1,4 @@
 /.idea/workspace.xml
 /.idea/shelf
 /src-php/huii.sql
+/src-php/.phpunit.result.cache

src-php/test/bootstrap.php

@@ -30,8 +30,9 @@ $testSqlFsPath = N2N::getVarStore()->requestFileFsPath('bak', null, null, 'backu
 $sql = IoUtils::getContents($testSqlFsPath);
 
 $sql = preg_replace('/^(INSERT|VALUES|\().*/m', '', $sql);
-$sql = preg_replace('/^ALTER TABLE .* ADD (INDEX|UNIQUE|FULLTEXT).*/m', '', $sql);
-$sql = preg_replace('/ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE [^;]+/', '', $sql);
+$sql = preg_replace('/^ALTER TABLE `([^`]+)` ADD UNIQUE INDEX `([^`]+)`/m', 'CREATE UNIQUE INDEX $1_$2 ON $1 ', $sql);
+$sql = preg_replace('/^ALTER TABLE `([^`]+)` ADD (INDEX|FULLTEXT).*/m', '', $sql);
+$sql = preg_replace('/ENGINE=InnoDB DEFAULT CHARSET=utf8[\S]* COLLATE [^;]+/', '', $sql);
 $sql = preg_replace('/\\,(\\s)*PRIMARY KEY.*/m', '', $sql);
 $sql = preg_replace('/ENUM\([^\)]+\)/', 'VARCHAR(255)', $sql);
 $sql = preg_replace('/INT (UNSIGNED )?NOT NULL AUTO_INCREMENT/', 'INTEGER PRIMARY KEY AUTOINCREMENT', $sql);

src-php/test/internship/controller/ArticleControllerTest.php

@@ -4,7 +4,7 @@ namespace internship\controller;
 
 use PHPUnit\Framework\TestCase;
 use n2n\test\TestEnv;
-use intership\test\ArticleTestEnv;
+use internship\test\ArticleTestEnv;
 use util\GeneralTestEnv;
 
 

src-php/var/bak/backup.sql

@@ -5,8 +5,8 @@
 DROP TABLE IF EXISTS `article`;
 CREATE TABLE `article` (
         `id` INT NOT NULL AUTO_INCREMENT,
-        `categoryName` VARCHAR(255) NULL DEFAULT NULL,
+        `category_name` VARCHAR(255) NULL DEFAULT NULL,
         `title` VARCHAR(255) NULL DEFAULT NULL,
         `text` VARCHAR(10000) NULL DEFAULT NULL,
         PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci ;

src-php/var/etc/app.ini

@@ -89,7 +89,7 @@ log.send_mail = true
 
 
 [database : live]
-default.dsn_uri = "mysql:host=localhost;dbname=livedbname"
+default.dsn_uri = "mysql:host=localhost;dbname=internship_playground"
 default.user = "dbuser"
 default.password = "pass"
 default.transaction_isolation_level = "SERIALIZABLE"
@@ -97,7 +97,7 @@ default.dialect = "n2n\impl\persistence\meta\mysql\MysqlDialect"
 
 
 [database : development]
-default.dsn_uri = "mysql:host=localhost;dbname=n2n7_test"
+default.dsn_uri = "mysql:host=localhost;dbname=internship_playground"
 default.user = "root"
 default.password = ""
 default.transaction_isolation_level = "SERIALIZABLE"