rename db connection parameter

tyrant88 · Nov 16, 2021 · 370f009 · 370f009
1 parent 668a884
commit 370f009
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/lib/yform.php b/lib/yform.php
@@ -75,7 +75,7 @@ public function __construct(array $params = [])
         $this->objparams['output'] = ''; // Final output of form
 
         // predefined dataset via sql
-        $this->objparams['db_connection_id'] = 1; // ID of db connection in config.yml
+        $this->objparams['db_id'] = 1; // ID of db connection in config.yml
         $this->objparams['main_where'] = ''; // like "id=12" for db
         $this->objparams['main_id'] = -1; // unique Dataset ID
         $this->objparams['main_table'] = ''; // for db and unique
@@ -279,7 +279,7 @@ public function executeFields(): self
         // 2. setValue defaults via sql_object
         if ($this->objparams['getdata']) {
             if (!$this->objparams['sql_object'] instanceof rex_sql) {
-                $this->objparams['sql_object'] = rex_sql::factory($this->objparams['db_connection_id']);
+                $this->objparams['sql_object'] = rex_sql::factory($this->objparams['db_id']);
                 $this->objparams['sql_object']->setDebug($this->objparams['debug']);
                 $this->objparams['sql_object']->setQuery('SELECT * from ' . $this->objparams['main_table'] . ' WHERE ' . $this->objparams['main_where']);
             }

diff --git a/lib/yform/action/create_table.php b/lib/yform/action/create_table.php
@@ -16,7 +16,7 @@ public function executeAction()
 
         $table_exists = false;
 
-        $tables = rex_sql::factory($this->params['db_connection_id'])->getArray('show tables');
+        $tables = rex_sql::factory($this->params['db_id'])->getArray('show tables');
         foreach ($tables as $table) {
             if (current($table) == $table_name) {
                 $table_exists = true;
@@ -25,16 +25,16 @@ public function executeAction()
         }
 
         if (!$table_exists) {
-            rex_sql::factory($this->params['db_connection_id'])->setQuery('CREATE TABLE `' . $table_name . '` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;');
+            rex_sql::factory($this->params['db_id'])->setQuery('CREATE TABLE `' . $table_name . '` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;');
         }
 
-        foreach (rex_sql::factory($this->params['db_connection_id'])->getArray('show columns from ' . $table_name) as $k => $v) {
+        foreach (rex_sql::factory($this->params['db_id'])->getArray('show columns from ' . $table_name) as $k => $v) {
             $cols[] = $v['Field'];
         }
 
         foreach ($this->params['value_pool']['sql'] as $key => $value) {
             if (!in_array($key, $cols)) {
-                rex_sql::factory($this->params['db_connection_id'])->setQuery('ALTER TABLE `' . $table_name . '` ADD `' . $key . '` TEXT NOT NULL;');
+                rex_sql::factory($this->params['db_id'])->setQuery('ALTER TABLE `' . $table_name . '` ADD `' . $key . '` TEXT NOT NULL;');
             }
         }
     }

diff --git a/lib/yform/action/createdb.php b/lib/yform/action/createdb.php
@@ -14,7 +14,7 @@ public function executeAction()
         $table_name = $this->getElement(2);
         $table_exists = false;
 
-        $tables = rex_sql::factory($this->params['db_connection_id'])->getArray('show tables');
+        $tables = rex_sql::factory($this->params['db_id'])->getArray('show tables');
         foreach ($tables as $table) {
             if (current($table) == $table_name) {
                 $table_exists = true;
@@ -23,16 +23,16 @@ public function executeAction()
         }
 
         if (!$table_exists) {
-            rex_sql::factory($this->params['db_connection_id'])->setQuery('CREATE TABLE `' . $table_name . '` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;');
+            rex_sql::factory($this->params['db_id'])->setQuery('CREATE TABLE `' . $table_name . '` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;');
         }
 
-        foreach (rex_sql::factory($this->params['db_connection_id'])->getArray('show columns from ' . $table_name) as $k => $v) {
+        foreach (rex_sql::factory($this->params['db_id'])->getArray('show columns from ' . $table_name) as $k => $v) {
             $cols[] = $v['Field'];
         }
 
         foreach ($this->params['value_pool']['sql'] as $key => $value) {
             if (!in_array($key, $cols)) {
-                rex_sql::factory($this->params['db_connection_id'])->setQuery('ALTER TABLE `' . $table_name . '` ADD `' . $key . '` TEXT NOT NULL;');
+                rex_sql::factory($this->params['db_id'])->setQuery('ALTER TABLE `' . $table_name . '` ADD `' . $key . '` TEXT NOT NULL;');
             }
         }
     }

diff --git a/lib/yform/action/db.php b/lib/yform/action/db.php
@@ -12,7 +12,7 @@ class rex_yform_action_db extends rex_yform_action_abstract
 {
     public function executeAction()
     {
-        $sql = rex_sql::factory($this->params['db_connection_id']);
+        $sql = rex_sql::factory($this->params['db_id']);
         $sql->setDebug($this->params['debug']);
 
         if (!$main_table = $this->getElement(2)) {
@@ -57,7 +57,7 @@ public function executeAction()
                 $action = 'update';
 
                 if ($this->params['main_id'] <= 0) {
-                    $sql_id = rex_sql::factory($this->params['db_connection_id']);
+                    $sql_id = rex_sql::factory($this->params['db_id']);
                     $sql_id->setTable($main_table);
                     $sql_id->setWhere($where);
                     $sql_id->select('id');

diff --git a/lib/yform/action/db_query.php b/lib/yform/action/db_query.php
@@ -22,7 +22,7 @@ public function executeAction()
         }
 
         try {
-            $sql = rex_sql::factory($this->params['db_connection_id']);
+            $sql = rex_sql::factory($this->params['db_id']);
             $sql->setDebug($this->params['debug']);
 
             $params = [];

diff --git a/lib/yform/action/readtable.php b/lib/yform/action/readtable.php
@@ -16,7 +16,7 @@ public function executeAction()
         }
         $value = $this->params['value_pool']['email'][$this->getElement(4)];
 
-        $gd = rex_sql::factory($this->params['db_connection_id']);
+        $gd = rex_sql::factory($this->params['db_id']);
         if ($this->params['debug']) {
             $gd->setDebug();
         }

diff --git a/lib/yform/validate/in_table.php b/lib/yform/validate/in_table.php
@@ -11,7 +11,7 @@ class rex_yform_validate_in_table extends rex_yform_validate_abstract
 {
     public function enterObject()
     {
-        $db = rex_sql::factory($this->params['db_connection_id']);
+        $db = rex_sql::factory($this->params['db_id']);
         $db->setDebug($this->params['debug']);
 
         $table = $this->getElement(3);

diff --git a/lib/yform/validate/unique.inc.php b/lib/yform/validate/unique.inc.php
@@ -11,7 +11,7 @@ class rex_yform_validate_unique extends rex_yform_validate_abstract
 {
     public function enterObject()
     {
-        $cd = rex_sql::factory($this->params['db_connection_id']);
+        $cd = rex_sql::factory($this->params['db_id']);
 
         $table = $this->params['main_table'];
         if ('' != $this->getElement('table')) {

diff --git a/lib/yform/value/choice.php b/lib/yform/value/choice.php
@@ -21,7 +21,7 @@ public function enterObject()
             'multiple' => $this->getElement('multiple'),
             'placeholder' => $this->getElement('placeholder'),
             'preferred_choices' => $this->getElement('preferred_choices'),
-            'db_connection_id' => $this->params['db_connection_id'],
+            'db_id' => $this->params['db_id'],
         ]);
 
         if (null === $this->getValue()) {
@@ -309,7 +309,7 @@ private static function createChoiceList($elements)
         $choiceList = new rex_yform_choice_list($options);
 
         if (is_string($choicesElement) && 'SELECT' == rex_sql::getQueryType($choicesElement)) {
-            $sql = rex_sql::factory($elements['db_connection_id']);
+            $sql = rex_sql::factory($elements['db_id']);
             $sql->setDebug($self->getParam('debug'));
             $choiceList->createListFromSqlArray(
                 $sql->getArray($choicesElement)

diff --git a/lib/yform/value/index.php b/lib/yform/value/index.php
@@ -107,7 +107,7 @@ private function addRelation(array &$relations, array $names)
     private function getRelationValues(array $relations)
     {
         $table = rex_yform_manager_table::get($this->params['main_table']);
-        $sql = rex_sql::factory($this->params['db_connection_id']);
+        $sql = rex_sql::factory($this->params['db_id']);
         $sql->setDebug($this->params['debug']);
 
         foreach ($relations as $name => $sub) {

diff --git a/lib/yform/value/mediafile.php b/lib/yform/value/mediafile.php
@@ -203,7 +203,7 @@ public function saveMedia($FILE, $filefolder, $extensions_array, $rex_media_cate
         $RETURN['ok'] = true;
         $RETURN['filename'] = $NFILENAME;
 
-        $saveSQL = rex_sql::factory($this->params['db_connection_id'])
+        $saveSQL = rex_sql::factory($this->params['db_id'])
             ->setTable(rex::getTablePrefix() . 'media')
             ->setValue('title', '')
             ->setValue('filetype', $FILETYPE)