summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
committerFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
commitb4841bc83374052c46fbc3f4a223484199546fd8 (patch)
tree385733a716c03b576335e5bb98361c13e92138f3 /system/database/DB_driver.php
parent98f7c65dddf0667f1a0462e08be9e6273ce658fb (diff)
parentc576995304fc3609cca0b7b92d1b2cd611ec82f5 (diff)
Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php20
1 files changed, 7 insertions, 13 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index f8956f069..5ae0442a3 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
- * @license http://opensource.org/licenses/MIT MIT License
+ * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 1.0.0
* @filesource
@@ -142,7 +142,7 @@ abstract class CI_DB_driver {
*
* @var int
*/
- public $port = '';
+ public $port = NULL;
/**
* Persistent connection flag
@@ -1308,19 +1308,13 @@ abstract class CI_DB_driver {
*/
public function list_fields($table)
{
- // Is there a cached result?
- if (isset($this->data_cache['field_names'][$table]))
- {
- return $this->data_cache['field_names'][$table];
- }
-
if (FALSE === ($sql = $this->_list_columns($table)))
{
return ($this->db_debug) ? $this->display_error('db_unsupported_function') : FALSE;
}
$query = $this->query($sql);
- $this->data_cache['field_names'][$table] = array();
+ $fields = array();
foreach ($query->result_array() as $row)
{
@@ -1342,10 +1336,10 @@ abstract class CI_DB_driver {
}
}
- $this->data_cache['field_names'][$table][] = $row[$key];
+ $fields[] = $row[$key];
}
- return $this->data_cache['field_names'][$table];
+ return $fields;
}
// --------------------------------------------------------------------