@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * List databases |
29 | 29 | * |
30 | 30 | * @access private |
31 | - * @return bool |
|
31 | + * @return string |
|
32 | 32 | */ |
33 | 33 | function _list_databases() |
34 | 34 | { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @access private |
46 | 46 | * @param string the table name |
47 | - * @return object |
|
47 | + * @return string |
|
48 | 48 | */ |
49 | 49 | function _optimize_table($table) |
50 | 50 | { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * |
61 | 61 | * @access private |
62 | 62 | * @param string the table name |
63 | - * @return object |
|
63 | + * @return string |
|
64 | 64 | */ |
65 | 65 | function _repair_table($table) |
66 | 66 | { |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * |
74 | 74 | * @access private |
75 | 75 | * @param array Preferences |
76 | - * @return mixed |
|
76 | + * @return false|string |
|
77 | 77 | */ |
78 | 78 | function _backup($params = array()) |
79 | 79 | { |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | * |
370 | 370 | * @access public |
371 | 371 | * @param string |
372 | - * @return string |
|
372 | + * @return integer |
|
373 | 373 | */ |
374 | 374 | function count_all($table = '') |
375 | 375 | { |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | * |
439 | 439 | * @access public |
440 | 440 | * @param string the table name |
441 | - * @return object |
|
441 | + * @return string |
|
442 | 442 | */ |
443 | 443 | function _field_data($table) |
444 | 444 | { |
@@ -523,7 +523,7 @@ discard block |
||
523 | 523 | * |
524 | 524 | * @access public |
525 | 525 | * @param type |
526 | - * @return type |
|
526 | + * @return string |
|
527 | 527 | */ |
528 | 528 | function _from_tables($tables) |
529 | 529 | { |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @access private |
31 | 31 | * @param string the database name |
32 | - * @return bool |
|
32 | + * @return string |
|
33 | 33 | */ |
34 | 34 | function _create_database($name) |
35 | 35 | { |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @access private |
45 | 45 | * @param string the database name |
46 | - * @return bool |
|
46 | + * @return string |
|
47 | 47 | */ |
48 | 48 | function _drop_database($name) |
49 | 49 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @param mixed primary key(s) |
141 | 141 | * @param mixed key(s) |
142 | 142 | * @param boolean should 'IF NOT EXISTS' be added to the SQL |
143 | - * @return bool |
|
143 | + * @return string |
|
144 | 144 | */ |
145 | 145 | function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) |
146 | 146 | { |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * @param string the column name |
213 | 213 | * @param array fields |
214 | 214 | * @param string the field after which we should add the new field |
215 | - * @return object |
|
215 | + * @return string |
|
216 | 216 | */ |
217 | 217 | function _alter_table($alter_type, $table, $fields, $after_field = '') |
218 | 218 | { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * List databases |
29 | 29 | * |
30 | 30 | * @access private |
31 | - * @return bool |
|
31 | + * @return string |
|
32 | 32 | */ |
33 | 33 | function _list_databases() |
34 | 34 | { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @access private |
46 | 46 | * @param string the table name |
47 | - * @return object |
|
47 | + * @return string |
|
48 | 48 | */ |
49 | 49 | function _optimize_table($table) |
50 | 50 | { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * |
61 | 61 | * @access private |
62 | 62 | * @param string the table name |
63 | - * @return object |
|
63 | + * @return string |
|
64 | 64 | */ |
65 | 65 | function _repair_table($table) |
66 | 66 | { |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | * Select the database |
117 | 117 | * |
118 | 118 | * @access private called by the base class |
119 | - * @return resource |
|
119 | + * @return boolean |
|
120 | 120 | */ |
121 | 121 | public function db_select() |
122 | 122 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @access public |
133 | 133 | * @param string |
134 | 134 | * @param string |
135 | - * @return resource |
|
135 | + * @return boolean |
|
136 | 136 | */ |
137 | 137 | public function db_set_charset($charset, $collation) |
138 | 138 | { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * getCursor. Returns a cursor from the datbase |
210 | 210 | * |
211 | 211 | * @access public |
212 | - * @return cursor id |
|
212 | + * @return resource id |
|
213 | 213 | */ |
214 | 214 | public function get_cursor() |
215 | 215 | { |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | * |
454 | 454 | * @access public |
455 | 455 | * @param string |
456 | - * @return string |
|
456 | + * @return integer |
|
457 | 457 | */ |
458 | 458 | public function count_all($table = '') |
459 | 459 | { |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | * |
523 | 523 | * @access public |
524 | 524 | * @param string the table name |
525 | - * @return object |
|
525 | + * @return string |
|
526 | 526 | */ |
527 | 527 | protected function _field_data($table) |
528 | 528 | { |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | * |
612 | 612 | * @access protected |
613 | 613 | * @param type |
614 | - * @return type |
|
614 | + * @return string |
|
615 | 615 | */ |
616 | 616 | protected function _from_tables($tables) |
617 | 617 | { |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | * result set starts at zero |
126 | 126 | * |
127 | 127 | * @access private |
128 | - * @return array |
|
128 | + * @return boolean |
|
129 | 129 | */ |
130 | 130 | function _data_seek($n = 0) |
131 | 131 | { |
@@ -184,7 +184,8 @@ discard block |
||
184 | 184 | * not available (odbc_fetch_object requires unixODBC) |
185 | 185 | * |
186 | 186 | * @access private |
187 | - * @return object |
|
187 | + * @return boolean |
|
188 | + * @param null|false $odbc_result |
|
188 | 189 | */ |
189 | 190 | function _odbc_fetch_object(& $odbc_result) { |
190 | 191 | $rs = array(); |
@@ -207,6 +208,7 @@ discard block |
||
207 | 208 | * |
208 | 209 | * @access private |
209 | 210 | * @return array |
211 | + * @param null|false $odbc_result |
|
210 | 212 | */ |
211 | 213 | function _odbc_fetch_array(& $odbc_result) { |
212 | 214 | $rs = array(); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * Non-persistent database connection |
90 | 90 | * |
91 | 91 | * @access private called by the base class |
92 | - * @return resource |
|
92 | + * @return PDO |
|
93 | 93 | */ |
94 | 94 | function db_connect() |
95 | 95 | { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * Persistent database connection |
105 | 105 | * |
106 | 106 | * @access private called by the base class |
107 | - * @return resource |
|
107 | + * @return PDO |
|
108 | 108 | */ |
109 | 109 | function db_pconnect() |
110 | 110 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * Select the database |
141 | 141 | * |
142 | 142 | * @access private called by the base class |
143 | - * @return resource |
|
143 | + * @return boolean |
|
144 | 144 | */ |
145 | 145 | function db_select() |
146 | 146 | { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | * @access public |
157 | 157 | * @param string |
158 | 158 | * @param string |
159 | - * @return resource |
|
159 | + * @return boolean |
|
160 | 160 | */ |
161 | 161 | function db_set_charset($charset, $collation) |
162 | 162 | { |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | * |
395 | 395 | * @access public |
396 | 396 | * @param string |
397 | - * @return string |
|
397 | + * @return integer |
|
398 | 398 | */ |
399 | 399 | function count_all($table = '') |
400 | 400 | { |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | * |
465 | 465 | * @access public |
466 | 466 | * @param string the table name |
467 | - * @return object |
|
467 | + * @return string |
|
468 | 468 | */ |
469 | 469 | function _field_data($table) |
470 | 470 | { |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * @param mixed primary key(s) |
74 | 74 | * @param mixed key(s) |
75 | 75 | * @param boolean should 'IF NOT EXISTS' be added to the SQL |
76 | - * @return bool |
|
76 | + * @return string |
|
77 | 77 | */ |
78 | 78 | function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) |
79 | 79 | { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * @param string the default value |
204 | 204 | * @param boolean should 'NOT NULL' be added |
205 | 205 | * @param string the field after which we should add the new field |
206 | - * @return object |
|
206 | + * @return string |
|
207 | 207 | */ |
208 | 208 | function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') |
209 | 209 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * Select the database |
125 | 125 | * |
126 | 126 | * @access private called by the base class |
127 | - * @return resource |
|
127 | + * @return boolean |
|
128 | 128 | */ |
129 | 129 | function db_select() |
130 | 130 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @access public |
141 | 141 | * @param string |
142 | 142 | * @param string |
143 | - * @return resource |
|
143 | + * @return boolean |
|
144 | 144 | */ |
145 | 145 | function db_set_charset($charset, $collation) |
146 | 146 | { |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | * |
369 | 369 | * @access public |
370 | 370 | * @param string |
371 | - * @return string |
|
371 | + * @return integer |
|
372 | 372 | */ |
373 | 373 | function count_all($table = '') |
374 | 374 | { |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | * |
438 | 438 | * @access public |
439 | 439 | * @param string the table name |
440 | - * @return object |
|
440 | + * @return string |
|
441 | 441 | */ |
442 | 442 | function _field_data($table) |
443 | 443 | { |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | * The error message number |
464 | 464 | * |
465 | 465 | * @access private |
466 | - * @return integer |
|
466 | + * @return string |
|
467 | 467 | */ |
468 | 468 | function _error_number() |
469 | 469 | { |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | * |
523 | 523 | * @access public |
524 | 524 | * @param type |
525 | - * @return type |
|
525 | + * @return string |
|
526 | 526 | */ |
527 | 527 | function _from_tables($tables) |
528 | 528 | { |