sql stored fn - code reuse

~dev_rating/modules/account/classes/Model/Kohana/Account.php

@@ -66,6 +66,10 @@ class Model_Kohana_Account extends Model
 
     public function createTeacherByDepName($lastName, $firstName, $secondName, $departmentID, $facultyID, $activationCode)
     {
+        if ($departmentID == '') {
+            return -1;
+        }
+
         $db = Database::instance();
         $lastName = $db->escape($lastName);
         $secondName = $db->escape($secondName);
@@ -130,7 +134,7 @@ class Model_Kohana_Account extends Model
     public function changeMail($id, $mail)
     {
         $mail = Database::instance()->escape($mail);
-        $sql = "SELECT `ChangeMail`('$id', $mail) AS Num;";
+        $sql = "SELECT `ChangeAccountData`('$id', $mail, 'email') AS Num;";
         $query = DB::query(Database::SELECT, $sql)->execute();
         return $query->get('Num');
     }
@@ -138,7 +142,7 @@ class Model_Kohana_Account extends Model
     public function changeLogin($id, $login)
     {
         $login = Database::instance()->escape($login);
-        $sql = "SELECT `ChangeLogin`('$id', $login) AS Num;";
+        $sql = "SELECT `ChangeAccountData`('$id', $login, 'login') AS Num;";
         $query = DB::query(Database::SELECT, $sql)->execute();
         return $query->get('Num');
     }
@@ -146,7 +150,7 @@ class Model_Kohana_Account extends Model
     public function changePassword($id, $password)
     {
         $password = Database::instance()->escape($password);
-        $sql = "SELECT `ChangePassword`('$id', $password) AS Num;";
+        $sql = "SELECT `ChangeAccountData`('$id', $password, 'password') AS Num;";
         $query = DB::query(Database::SELECT, $sql)->execute();
         return $query->get('Num');
     }
@@ -154,7 +158,7 @@ class Model_Kohana_Account extends Model
     public function getAccNumByLogin($login)
     {
         $login = Database::instance()->escape($login);
-        $sql = "SELECT `GetAccCountByLogin`($login) AS Num;";
+        $sql = "SELECT `CheckAccountExistence`($login, 'login') AS Num;";
         $res = DB::query(Database::SELECT, $sql)->execute();
         return $res->get('Num');
     }
@@ -162,7 +166,7 @@ class Model_Kohana_Account extends Model
     public function getAccNumByMail($email)
     {
         $email = Database::instance()->escape($email);
-        $sql = "SELECT `GetAccCountByMail`($email) AS Num;";
+        $sql = "SELECT `CheckAccountExistence`($email, 'email') AS Num;";
         $res = DB::query(Database::SELECT, $sql)->execute();
         return $res->get('Num');
     }
@@ -170,7 +174,7 @@ class Model_Kohana_Account extends Model
     public function isActivationCodeValid($code)
     {
         $code = Database::instance()->escape($code);
-        $sql = "SELECT `GetAccCountByCode`($code) AS Num;";
+        $sql = "SELECT `CheckAccountExistence`($code, 'code') AS Num;";
         $res = DB::query(Database::SELECT, $sql)->execute();
 
         $count = $res[0]['Num'];