Skip to content

Commit b21ede4

Browse files
committed
Include comments for db drivers getColumnsMeta method
1 parent a5bdb2c commit b21ede4

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

system/db/mysqli.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,11 @@ public function __construct($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER,
163163
/*
164164
* Get all columns for a table used for sanitizing input
165165
*/
166-
function getColumnsMeta($tableName) {
166+
function getColumnsMeta($tableName, $comment = false) {
167167
$sql =
168-
'SELECT COLUMN_NAME as name, COLUMN_DEFAULT as d, IS_NULLABLE as n, DATA_TYPE as t, EXTRA as e
169-
FROM `INFORMATION_SCHEMA`.`COLUMNS`
168+
'SELECT COLUMN_NAME as name, COLUMN_DEFAULT as d, IS_NULLABLE as n, DATA_TYPE as t, EXTRA as e, CHARACTER_MAXIMUM_LENGTH as l'
169+
. ($comment ? ', COLUMN_COMMENT as c' : '') .
170+
' FROM `INFORMATION_SCHEMA`.`COLUMNS`
170171
WHERE `TABLE_SCHEMA`= "' . DB_NAME . '"
171172
AND `TABLE_NAME`="' . $tableName . '"';
172173

system/db/pgsql.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ public function __construct($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER,
100100
/*
101101
* Get all columns for a table used for sanitizing input
102102
*/
103-
function getColumnsMeta($tableName) {
103+
function getColumnsMeta($tableName, $comment = false) {
104104
$sql =
105-
"SELECT data_type as t, column_name as name, column_default as d, is_nullable as n FROM information_schema.columns WHERE table_name ='$tableName'";
105+
"SELECT data_type as t, column_name as name, column_default as d, is_nullable as n, character_maximum_length as l FROM information_schema.columns WHERE table_name ='$tableName'";
106106

107107
if ($result = $this->query($sql)) {
108108
//$columns = $result->fetch_all(MYSQLI_ASSOC);

system/db/sqlite.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function __construct($filename = DB_HOST, $dbname = DB_NAME, $user = DB_U
9393
/*
9494
* Get all columns for a table used for sanitizing input
9595
*/
96-
function getColumnsMeta($tableName) {
96+
function getColumnsMeta($tableName, $comment = false) {
9797
$sql =
9898
"SELECT type as t, name, dflt_value as d, `notnull` as n FROM pragma_table_info('$tableName');";
9999

@@ -258,6 +258,8 @@ public function execute($sql, $params = [], $paramTypes = []) {
258258
}
259259

260260
if ($stmt) {
261+
$result = null;
262+
261263
try {
262264
if ($result = $stmt->execute()) {
263265
$this->affected_rows = self :: $link->changes();

0 commit comments

Comments
 (0)