diff --git a/main/inc/lib/VideoChat.php b/main/inc/lib/VideoChat.php index 7d216040e3..8c5e0c9a0a 100644 --- a/main/inc/lib/VideoChat.php +++ b/main/inc/lib/VideoChat.php @@ -27,7 +27,7 @@ class VideoChat return Database::select( '*', - Database::get_main_table(TABLE_MAIN_VIDEO_CHAT), + Database::get_main_table(TABLE_MAIN_CHAT_VIDEO), [ 'where' => [ '(from_user = ? AND to_user = ?)' => [$user1, $user2], @@ -48,7 +48,7 @@ class VideoChat public static function createRoom($name, $fromUser, $toUser) { return Database::insert( - Database::get_main_table(TABLE_MAIN_VIDEO_CHAT), + Database::get_main_table(TABLE_MAIN_CHAT_VIDEO), [ 'from_user' => intval($fromUser), 'to_user' => intval($toUser), @@ -67,7 +67,7 @@ class VideoChat { $resultData = Database::select( 'COUNT(1) AS count', - Database::get_main_table(TABLE_MAIN_VIDEO_CHAT), + Database::get_main_table(TABLE_MAIN_CHAT_VIDEO), [ 'where' => ['room_name = ?' => $name] ], @@ -90,7 +90,7 @@ class VideoChat { return Database::select( '*', - Database::get_main_table(TABLE_MAIN_VIDEO_CHAT), + Database::get_main_table(TABLE_MAIN_CHAT_VIDEO), [ 'where' => ['room_name = ?' => $name] ], diff --git a/main/inc/lib/database.constants.inc.php b/main/inc/lib/database.constants.inc.php index d58c31c58c..924edc3acc 100755 --- a/main/inc/lib/database.constants.inc.php +++ b/main/inc/lib/database.constants.inc.php @@ -328,7 +328,7 @@ define('TABLE_MAIN_SKILL_REL_PROFILE', 'skill_rel_profile'); define('TABLE_MAIN_CHAT', 'chat'); define('TABLE_TIMELINE', 'timeline'); -define('TABLE_MAIN_VIDEO_CHAT', 'video_chat'); +define('TABLE_MAIN_CHAT_VIDEO', 'chat_video'); // Gradebook model define('TABLE_GRADE_MODEL', 'grade_model'); diff --git a/main/install/database.sql b/main/install/database.sql index 6eada2f8e8..95a5927676 100644 --- a/main/install/database.sql +++ b/main/install/database.sql @@ -4602,8 +4602,8 @@ CREATE TABLE c_attendance_calendar_rel_group ( ); -- 1.10.0.38 -DROP TABLE IF EXISTS video_chat; -CREATE TABLE IF NOT EXISTS video_chat( +DROP TABLE IF EXISTS chat_video; +CREATE TABLE IF NOT EXISTS chat_video( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, from_user INT NOT NULL, to_user INT NOT NULL, @@ -4611,10 +4611,10 @@ CREATE TABLE IF NOT EXISTS video_chat( datetime DATETIME NOT NULL ); -ALTER TABLE video_chat ADD INDEX idx_video_chat_from_user (from_user); -ALTER TABLE video_chat ADD INDEX idx_video_chat_to_user (to_user); -ALTER TABLE video_chat ADD INDEX idx_video_chat_users (from_user, to_user); -ALTER TABLE video_chat ADD INDEX idx_video_chat_room_name (room_name); +ALTER TABLE chat_video ADD INDEX idx_chat_video_from_user (from_user); +ALTER TABLE chat_video ADD INDEX idx_chat_video_to_user (to_user); +ALTER TABLE chat_video ADD INDEX idx_chat_video_users (from_user, to_user); +ALTER TABLE chat_video ADD INDEX idx_chat_video_room_name (room_name); -- Version LOCK TABLES settings_current WRITE; diff --git a/src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150505142900.php b/src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150505142900.php index acdda8213e..2adfe9f404 100644 --- a/src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150505142900.php +++ b/src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150505142900.php @@ -22,7 +22,7 @@ class Version20150505142900 extends AbstractMigrationChamilo { // Create table for video chat $this->addSql(" - CREATE TABLE IF NOT EXISTS video_chat( + CREATE TABLE IF NOT EXISTS chat_video( id int primary key not null auto_increment, from_user int not null, to_user int not null, @@ -38,6 +38,6 @@ class Version20150505142900 extends AbstractMigrationChamilo */ public function down(Schema $schema) { - $this->addSql("DROP TABLE IF EXISTS video_chat;"); + $this->addSql("DROP TABLE IF EXISTS chat_video;"); } }