Moved database columns as constants in wrapper classes

[shipsimu.git] / application / ship-simu / main / wrapper / class_CompanyDatabaseWrapper.php

diff --git a/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php b/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php
index 7cf15803d125530936fb87815dbd3ee7e3df69ca..72e7844d67cc427e3ddeeae1933917bc2051f2fb 100644 (file)
--- a/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php
+++ b/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php
@@ -28,8 +28,11 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper {
        private $companyInstance = null;
 
        // Constants for database tables
-       const DB_TABLE_COMPANY_DATA = "company";
-       const DB_TABLE_COMPANY_USER = "company_user";
+       const DB_TABLE_COMPANY_DATA = 'company';
+       const DB_TABLE_COMPANY_USER = 'company_user';
+
+       // Constants for database columns
+       const DB_COLUMN_PARTICIPANT_ID = 'participant_id';
 
        /**
         * Protected constructor
@@ -75,17 +78,17 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper {
                $participates = false;
 
                // Get a search criteria class
-               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
+               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Add the user primary key as a search criteria
-               $criteriaInstance->addCriteria("participant_id", $userInstance->getPrimaryKey());
-               $criteriaInstance->setLimit(1);
+               $searchInstance->addCriteria(self::DB_COLUMN_PARTICIPANT_ID, $userInstance->getPrimaryKey());
+               $searchInstance->setLimit(1);
 
                // Set company->user table
                $this->setTableName(self::DB_TABLE_COMPANY_USER);
 
                // Get the result back
-               $resultInstance = $this->doSelectByCriteria($criteriaInstance);
+               $resultInstance = $this->doSelectByCriteria($searchInstance);
 
                // Is there a result?
                if ($resultInstance->next()) {