From 84c4322bded8388a4c5608d29100a059d24a3c7f Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Tue, 24 Jan 2023 10:29:57 -0500 Subject: [PATCH] Gate postgres links --- .INFO | 11 +++++++++++ app/Config/Database.php | 20 ++++++++++++++++++++ app/Controllers/Myfit.php | 8 +++++++- app/Controllers/Myfituser.php | 8 ++++++++ docker/apache/Dockerfile | 2 ++ 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.INFO b/.INFO index 8984509..7a1cad0 100644 --- a/.INFO +++ b/.INFO @@ -31,3 +31,14 @@ CREATE TABLE `site_mermsemr_com`.`myfit_contact` ( PRIMARY KEY (`id`), UNIQUE INDEX `idmyfit_contact_UNIQUE` (`id` ASC) VISIBLE); + + + + CREATE TABLE `site_mermsemr_com`.`myfit_faq` ( + `uuid` VARCHAR(32) DEFAULT (uuid()), + `id` INT NOT NULL AUTO_INCREMENT, + `title` VARCHAR(45) NULL, + `text` TEXT NULL, + `added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE INDEX `idmyfit_faq_UNIQUE` (`id` ASC) VISIBLE); \ No newline at end of file diff --git a/app/Config/Database.php b/app/Config/Database.php index d97f0fc..65e1c38 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -50,6 +50,26 @@ class Database extends Config 'port' => 3306, ]; + public $mermsemr = [ + 'DSN' => '', + 'hostname' => '10.20.30.60', + 'username' => 'mermsemr', + 'password' => 'mermsemr', + 'database' => 'mermsemr_dev', + 'DBDriver' => 'postgre', + 'DBPrefix' => '', + 'pConnect' => false, + 'DBDebug' => (ENVIRONMENT !== 'production'), + 'charset' => 'utf8', + 'DBCollat' => 'utf8_general_ci', + 'swapPre' => '', + 'encrypt' => false, + 'compress' => false, + 'strictOn' => false, + 'failover' => [], + 'port' => 3306, + ]; + public $mermsemr_blog = [ 'DSN' => '', 'hostname' => '10.10.33.60', diff --git a/app/Controllers/Myfit.php b/app/Controllers/Myfit.php index a200a3d..e562cf8 100644 --- a/app/Controllers/Myfit.php +++ b/app/Controllers/Myfit.php @@ -148,8 +148,14 @@ class Myfit extends BaseController header('Access-Control-Allow-Methods: POST, GET, PUT, DELETE, OPTIONS'); header('Content-type: application/json'); + $db = \Config\Database::connect('mermsemr_site'); + $query = $db->query( + 'SELECT * FROM myfit_faq ORDER BY id ASC LIMIT 15' + ); + $data['faq_data'] = $query->getResultArray(); + $mFaq = new \App\Models\myfitFaqData(); - return $this->response->setJson($mFaq->getSiteFaq([])); + return $this->response->setJson($data['faq_data'] /*$mFaq->getSiteFaq([])*/); } public function pricing() diff --git a/app/Controllers/Myfituser.php b/app/Controllers/Myfituser.php index 2636003..faeb8d1 100644 --- a/app/Controllers/Myfituser.php +++ b/app/Controllers/Myfituser.php @@ -70,8 +70,16 @@ class Myfituser extends BaseController $raw_array = json_decode($raw_json, true); $something = $raw_array["name"]; + $sqlQ = "SELECT m.*,mp.* FROM members m LEFT JOIN members_profile mp ON m.id=mp.member_id WHERE m.id =12"; + $db = \Config\Database::connect('mermsemr'); + $query = $db->query( $sqlQ ); + $data['test_data'] = $query->getResultArray(); + + $inx = [ 'message_id' => rand(100, 8888) . 'gsgsgsgsg-sssfsgggsgs-ususususu', + 'test'=> $sqlQ, + 'test_data' => $data['test_data'], 'status'=>1, 'endpoint'=>$endpoint, 'raw_data'=> $raw_array diff --git a/docker/apache/Dockerfile b/docker/apache/Dockerfile index 8a35e58..4042580 100644 --- a/docker/apache/Dockerfile +++ b/docker/apache/Dockerfile @@ -24,6 +24,8 @@ RUN docker-php-ext-install \ calendar \ pdo_mysql \ mysqli +# pgsql + # pdo_pgsql \ #\ # pdo_pgsql \ # pgsql