@@ -191,50 +191,50 @@ |
||
| 191 | 191 | if ($s) $s .= '+'; |
| 192 | 192 | $ch = $fmt[$i]; |
| 193 | 193 | switch($ch) { |
| 194 | - case 'Y': |
|
| 195 | - case 'y': |
|
| 196 | - $s .= "datename(yyyy,$col)"; |
|
| 197 | - break; |
|
| 198 | - case 'M': |
|
| 199 | - $s .= "convert(char(3),$col,0)"; |
|
| 200 | - break; |
|
| 201 | - case 'm': |
|
| 202 | - $s .= "replace(str(month($col),2),' ','0')"; |
|
| 203 | - break; |
|
| 204 | - case 'Q': |
|
| 205 | - case 'q': |
|
| 206 | - $s .= "datename(quarter,$col)"; |
|
| 207 | - break; |
|
| 208 | - case 'D': |
|
| 209 | - case 'd': |
|
| 210 | - $s .= "replace(str(day($col),2),' ','0')"; |
|
| 211 | - break; |
|
| 212 | - case 'h': |
|
| 213 | - $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
| 214 | - break; |
|
| 194 | + case 'Y': |
|
| 195 | + case 'y': |
|
| 196 | + $s .= "datename(yyyy,$col)"; |
|
| 197 | + break; |
|
| 198 | + case 'M': |
|
| 199 | + $s .= "convert(char(3),$col,0)"; |
|
| 200 | + break; |
|
| 201 | + case 'm': |
|
| 202 | + $s .= "replace(str(month($col),2),' ','0')"; |
|
| 203 | + break; |
|
| 204 | + case 'Q': |
|
| 205 | + case 'q': |
|
| 206 | + $s .= "datename(quarter,$col)"; |
|
| 207 | + break; |
|
| 208 | + case 'D': |
|
| 209 | + case 'd': |
|
| 210 | + $s .= "replace(str(day($col),2),' ','0')"; |
|
| 211 | + break; |
|
| 212 | + case 'h': |
|
| 213 | + $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
| 214 | + break; |
|
| 215 | 215 | |
| 216 | - case 'H': |
|
| 217 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
| 218 | - break; |
|
| 216 | + case 'H': |
|
| 217 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
| 218 | + break; |
|
| 219 | 219 | |
| 220 | - case 'i': |
|
| 221 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
| 222 | - break; |
|
| 223 | - case 's': |
|
| 224 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
| 225 | - break; |
|
| 226 | - case 'a': |
|
| 227 | - case 'A': |
|
| 228 | - $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
| 229 | - break; |
|
| 220 | + case 'i': |
|
| 221 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
| 222 | + break; |
|
| 223 | + case 's': |
|
| 224 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
| 225 | + break; |
|
| 226 | + case 'a': |
|
| 227 | + case 'A': |
|
| 228 | + $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
| 229 | + break; |
|
| 230 | 230 | |
| 231 | - default: |
|
| 232 | - if ($ch == '\\') { |
|
| 233 | - $i++; |
|
| 234 | - $ch = substr($fmt,$i,1); |
|
| 235 | - } |
|
| 236 | - $s .= $this->qstr($ch); |
|
| 237 | - break; |
|
| 231 | + default: |
|
| 232 | + if ($ch == '\\') { |
|
| 233 | + $i++; |
|
| 234 | + $ch = substr($fmt,$i,1); |
|
| 235 | + } |
|
| 236 | + $s .= $this->qstr($ch); |
|
| 237 | + break; |
|
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | 240 | return $s; |
@@ -85,20 +85,20 @@ |
||
| 85 | 85 | $len = $fieldobj->max_length; |
| 86 | 86 | } |
| 87 | 87 | switch (strtoupper($t)) { |
| 88 | - case 'C': |
|
| 89 | - if ($len <= $this->blobSize) return 'C'; |
|
| 90 | - case 'M': |
|
| 91 | - return 'X'; |
|
| 88 | + case 'C': |
|
| 89 | + if ($len <= $this->blobSize) return 'C'; |
|
| 90 | + case 'M': |
|
| 91 | + return 'X'; |
|
| 92 | 92 | |
| 93 | - case 'D': return 'D'; |
|
| 93 | + case 'D': return 'D'; |
|
| 94 | 94 | |
| 95 | - case 'T': return 'T'; |
|
| 95 | + case 'T': return 'T'; |
|
| 96 | 96 | |
| 97 | - case 'L': return 'L'; |
|
| 97 | + case 'L': return 'L'; |
|
| 98 | 98 | |
| 99 | - case 'I': return 'I'; |
|
| 99 | + case 'I': return 'I'; |
|
| 100 | 100 | |
| 101 | - default: return 'N'; |
|
| 101 | + default: return 'N'; |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -229,43 +229,43 @@ discard block |
||
| 229 | 229 | if ($s) $s .= '||'; |
| 230 | 230 | $ch = $fmt[$i]; |
| 231 | 231 | switch($ch) { |
| 232 | - case 'Y': |
|
| 233 | - case 'y': |
|
| 234 | - $s .= "char(year($col))"; |
|
| 235 | - break; |
|
| 236 | - case 'M': |
|
| 237 | - $s .= "substr(monthname($col),1,3)"; |
|
| 238 | - break; |
|
| 239 | - case 'm': |
|
| 240 | - $s .= "right(digits(month($col)),2)"; |
|
| 241 | - break; |
|
| 242 | - case 'D': |
|
| 243 | - case 'd': |
|
| 244 | - $s .= "right(digits(day($col)),2)"; |
|
| 245 | - break; |
|
| 246 | - case 'H': |
|
| 247 | - case 'h': |
|
| 248 | - if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; |
|
| 249 | - else $s .= "''"; |
|
| 250 | - break; |
|
| 251 | - case 'i': |
|
| 252 | - case 'I': |
|
| 253 | - if ($col != $this->sysDate) |
|
| 254 | - $s .= "right(digits(minute($col)),2)"; |
|
| 232 | + case 'Y': |
|
| 233 | + case 'y': |
|
| 234 | + $s .= "char(year($col))"; |
|
| 235 | + break; |
|
| 236 | + case 'M': |
|
| 237 | + $s .= "substr(monthname($col),1,3)"; |
|
| 238 | + break; |
|
| 239 | + case 'm': |
|
| 240 | + $s .= "right(digits(month($col)),2)"; |
|
| 241 | + break; |
|
| 242 | + case 'D': |
|
| 243 | + case 'd': |
|
| 244 | + $s .= "right(digits(day($col)),2)"; |
|
| 245 | + break; |
|
| 246 | + case 'H': |
|
| 247 | + case 'h': |
|
| 248 | + if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; |
|
| 249 | + else $s .= "''"; |
|
| 250 | + break; |
|
| 251 | + case 'i': |
|
| 252 | + case 'I': |
|
| 253 | + if ($col != $this->sysDate) |
|
| 254 | + $s .= "right(digits(minute($col)),2)"; |
|
| 255 | + else $s .= "''"; |
|
| 256 | + break; |
|
| 257 | + case 'S': |
|
| 258 | + case 's': |
|
| 259 | + if ($col != $this->sysDate) |
|
| 260 | + $s .= "right(digits(second($col)),2)"; |
|
| 255 | 261 | else $s .= "''"; |
| 256 | - break; |
|
| 257 | - case 'S': |
|
| 258 | - case 's': |
|
| 259 | - if ($col != $this->sysDate) |
|
| 260 | - $s .= "right(digits(second($col)),2)"; |
|
| 261 | - else $s .= "''"; |
|
| 262 | - break; |
|
| 263 | - default: |
|
| 264 | - if ($ch == '\\') { |
|
| 265 | - $i++; |
|
| 266 | - $ch = substr($fmt,$i,1); |
|
| 267 | - } |
|
| 268 | - $s .= $this->qstr($ch); |
|
| 262 | + break; |
|
| 263 | + default: |
|
| 264 | + if ($ch == '\\') { |
|
| 265 | + $i++; |
|
| 266 | + $ch = substr($fmt,$i,1); |
|
| 267 | + } |
|
| 268 | + $s .= $this->qstr($ch); |
|
| 269 | 269 | } |
| 270 | 270 | } |
| 271 | 271 | return $s; |
@@ -311,48 +311,48 @@ discard block |
||
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | switch (strtoupper($t)) { |
| 314 | - case 'VARCHAR': |
|
| 315 | - case 'CHAR': |
|
| 316 | - case 'CHARACTER': |
|
| 317 | - case 'C': |
|
| 318 | - if ($len <= $this->blobSize) return 'C'; |
|
| 314 | + case 'VARCHAR': |
|
| 315 | + case 'CHAR': |
|
| 316 | + case 'CHARACTER': |
|
| 317 | + case 'C': |
|
| 318 | + if ($len <= $this->blobSize) return 'C'; |
|
| 319 | 319 | |
| 320 | - case 'LONGCHAR': |
|
| 321 | - case 'TEXT': |
|
| 322 | - case 'CLOB': |
|
| 323 | - case 'DBCLOB': // double-byte |
|
| 324 | - case 'X': |
|
| 325 | - return 'X'; |
|
| 320 | + case 'LONGCHAR': |
|
| 321 | + case 'TEXT': |
|
| 322 | + case 'CLOB': |
|
| 323 | + case 'DBCLOB': // double-byte |
|
| 324 | + case 'X': |
|
| 325 | + return 'X'; |
|
| 326 | 326 | |
| 327 | - case 'BLOB': |
|
| 328 | - case 'GRAPHIC': |
|
| 329 | - case 'VARGRAPHIC': |
|
| 330 | - return 'B'; |
|
| 327 | + case 'BLOB': |
|
| 328 | + case 'GRAPHIC': |
|
| 329 | + case 'VARGRAPHIC': |
|
| 330 | + return 'B'; |
|
| 331 | 331 | |
| 332 | - case 'DATE': |
|
| 333 | - case 'D': |
|
| 334 | - return 'D'; |
|
| 332 | + case 'DATE': |
|
| 333 | + case 'D': |
|
| 334 | + return 'D'; |
|
| 335 | 335 | |
| 336 | - case 'TIME': |
|
| 337 | - case 'TIMESTAMP': |
|
| 338 | - case 'T': |
|
| 339 | - return 'T'; |
|
| 336 | + case 'TIME': |
|
| 337 | + case 'TIMESTAMP': |
|
| 338 | + case 'T': |
|
| 339 | + return 'T'; |
|
| 340 | 340 | |
| 341 | - //case 'BOOLEAN': |
|
| 342 | - //case 'BIT': |
|
| 343 | - // return 'L'; |
|
| 341 | + //case 'BOOLEAN': |
|
| 342 | + //case 'BIT': |
|
| 343 | + // return 'L'; |
|
| 344 | 344 | |
| 345 | - //case 'COUNTER': |
|
| 346 | - // return 'R'; |
|
| 345 | + //case 'COUNTER': |
|
| 346 | + // return 'R'; |
|
| 347 | 347 | |
| 348 | - case 'INT': |
|
| 349 | - case 'INTEGER': |
|
| 350 | - case 'BIGINT': |
|
| 351 | - case 'SMALLINT': |
|
| 352 | - case 'I': |
|
| 353 | - return 'I'; |
|
| 348 | + case 'INT': |
|
| 349 | + case 'INTEGER': |
|
| 350 | + case 'BIGINT': |
|
| 351 | + case 'SMALLINT': |
|
| 352 | + case 'I': |
|
| 353 | + return 'I'; |
|
| 354 | 354 | |
| 355 | - default: return 'N'; |
|
| 355 | + default: return 'N'; |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | } |
@@ -84,12 +84,12 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | switch ($mode) |
| 86 | 86 | { |
| 87 | - case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break; |
|
| 88 | - case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break; |
|
| 87 | + case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break; |
|
| 88 | + case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break; |
|
| 89 | 89 | |
| 90 | - case ADODB_FETCH_DEFAULT: |
|
| 91 | - case ADODB_FETCH_BOTH: |
|
| 92 | - default: $this->fetchMode = MYSQL_BOTH; break; |
|
| 90 | + case ADODB_FETCH_DEFAULT: |
|
| 91 | + case ADODB_FETCH_BOTH: |
|
| 92 | + default: $this->fetchMode = MYSQL_BOTH; break; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $this->adodbFetchMode = $mode; |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | switch ($mode) |
| 122 | 122 | { |
| 123 | - case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break; |
|
| 124 | - case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break; |
|
| 123 | + case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break; |
|
| 124 | + case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break; |
|
| 125 | 125 | |
| 126 | - case ADODB_FETCH_DEFAULT: |
|
| 127 | - case ADODB_FETCH_BOTH: |
|
| 128 | - default: |
|
| 129 | - $this->fetchMode = MYSQL_BOTH; break; |
|
| 126 | + case ADODB_FETCH_DEFAULT: |
|
| 127 | + case ADODB_FETCH_BOTH: |
|
| 128 | + default: |
|
| 129 | + $this->fetchMode = MYSQL_BOTH; break; |
|
| 130 | 130 | } |
| 131 | 131 | $this->adodbFetchMode = $mode; |
| 132 | 132 | $this->ADORecordSet($queryID); |
@@ -958,105 +958,105 @@ discard block |
||
| 958 | 958 | */ |
| 959 | 959 | for ($i=0; $i < $max; $i++) { |
| 960 | 960 | switch($fmt[$i]) { |
| 961 | - case 'T': $dates .= date('T');break; |
|
| 962 | - // YEAR |
|
| 963 | - case 'L': $dates .= $arr['leap'] ? '1' : '0'; break; |
|
| 964 | - case 'r': // Thu, 21 Dec 2000 16:01:07 +0200 |
|
| 961 | + case 'T': $dates .= date('T');break; |
|
| 962 | + // YEAR |
|
| 963 | + case 'L': $dates .= $arr['leap'] ? '1' : '0'; break; |
|
| 964 | + case 'r': // Thu, 21 Dec 2000 16:01:07 +0200 |
|
| 965 | 965 | |
| 966 | - // 4.3.11 uses '04 Jun 2004' |
|
| 967 | - // 4.3.8 uses ' 4 Jun 2004' |
|
| 968 | - $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', ' |
|
| 969 | - . ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' '; |
|
| 966 | + // 4.3.11 uses '04 Jun 2004' |
|
| 967 | + // 4.3.8 uses ' 4 Jun 2004' |
|
| 968 | + $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', ' |
|
| 969 | + . ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' '; |
|
| 970 | 970 | |
| 971 | - if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; |
|
| 971 | + if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; |
|
| 972 | 972 | |
| 973 | - if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min; |
|
| 973 | + if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min; |
|
| 974 | 974 | |
| 975 | - if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs; |
|
| 975 | + if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs; |
|
| 976 | 976 | |
| 977 | - $gmt = adodb_get_gmt_diff(); |
|
| 978 | - $dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; |
|
| 977 | + $gmt = adodb_get_gmt_diff(); |
|
| 978 | + $dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; |
|
| 979 | 979 | |
| 980 | - case 'Y': $dates .= $year; break; |
|
| 981 | - case 'y': $dates .= substr($year,strlen($year)-2,2); break; |
|
| 982 | - // MONTH |
|
| 983 | - case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break; |
|
| 984 | - case 'Q': $dates .= ($month+3)>>2; break; |
|
| 985 | - case 'n': $dates .= $month; break; |
|
| 986 | - case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break; |
|
| 987 | - case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break; |
|
| 988 | - // DAY |
|
| 989 | - case 't': $dates .= $arr['ndays']; break; |
|
| 990 | - case 'z': $dates .= $arr['yday']; break; |
|
| 991 | - case 'w': $dates .= adodb_dow($year,$month,$day); break; |
|
| 992 | - case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break; |
|
| 993 | - case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break; |
|
| 994 | - case 'j': $dates .= $day; break; |
|
| 995 | - case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break; |
|
| 996 | - case 'S': |
|
| 997 | - $d10 = $day % 10; |
|
| 998 | - if ($d10 == 1) $dates .= 'st'; |
|
| 999 | - else if ($d10 == 2 && $day != 12) $dates .= 'nd'; |
|
| 1000 | - else if ($d10 == 3) $dates .= 'rd'; |
|
| 1001 | - else $dates .= 'th'; |
|
| 1002 | - break; |
|
| 980 | + case 'Y': $dates .= $year; break; |
|
| 981 | + case 'y': $dates .= substr($year,strlen($year)-2,2); break; |
|
| 982 | + // MONTH |
|
| 983 | + case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break; |
|
| 984 | + case 'Q': $dates .= ($month+3)>>2; break; |
|
| 985 | + case 'n': $dates .= $month; break; |
|
| 986 | + case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break; |
|
| 987 | + case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break; |
|
| 988 | + // DAY |
|
| 989 | + case 't': $dates .= $arr['ndays']; break; |
|
| 990 | + case 'z': $dates .= $arr['yday']; break; |
|
| 991 | + case 'w': $dates .= adodb_dow($year,$month,$day); break; |
|
| 992 | + case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break; |
|
| 993 | + case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break; |
|
| 994 | + case 'j': $dates .= $day; break; |
|
| 995 | + case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break; |
|
| 996 | + case 'S': |
|
| 997 | + $d10 = $day % 10; |
|
| 998 | + if ($d10 == 1) $dates .= 'st'; |
|
| 999 | + else if ($d10 == 2 && $day != 12) $dates .= 'nd'; |
|
| 1000 | + else if ($d10 == 3) $dates .= 'rd'; |
|
| 1001 | + else $dates .= 'th'; |
|
| 1002 | + break; |
|
| 1003 | 1003 | |
| 1004 | - // HOUR |
|
| 1005 | - case 'Z': |
|
| 1006 | - $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break; |
|
| 1007 | - case 'O': |
|
| 1008 | - $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff(); |
|
| 1009 | - $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; |
|
| 1004 | + // HOUR |
|
| 1005 | + case 'Z': |
|
| 1006 | + $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break; |
|
| 1007 | + case 'O': |
|
| 1008 | + $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff(); |
|
| 1009 | + $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; |
|
| 1010 | 1010 | |
| 1011 | - case 'H': |
|
| 1012 | - if ($hour < 10) $dates .= '0'.$hour; |
|
| 1013 | - else $dates .= $hour; |
|
| 1014 | - break; |
|
| 1015 | - case 'h': |
|
| 1016 | - if ($hour > 12) $hh = $hour - 12; |
|
| 1017 | - else { |
|
| 1018 | - if ($hour == 0) $hh = '12'; |
|
| 1019 | - else $hh = $hour; |
|
| 1020 | - } |
|
| 1011 | + case 'H': |
|
| 1012 | + if ($hour < 10) $dates .= '0'.$hour; |
|
| 1013 | + else $dates .= $hour; |
|
| 1014 | + break; |
|
| 1015 | + case 'h': |
|
| 1016 | + if ($hour > 12) $hh = $hour - 12; |
|
| 1017 | + else { |
|
| 1018 | + if ($hour == 0) $hh = '12'; |
|
| 1019 | + else $hh = $hour; |
|
| 1020 | + } |
|
| 1021 | 1021 | |
| 1022 | - if ($hh < 10) $dates .= '0'.$hh; |
|
| 1023 | - else $dates .= $hh; |
|
| 1024 | - break; |
|
| 1022 | + if ($hh < 10) $dates .= '0'.$hh; |
|
| 1023 | + else $dates .= $hh; |
|
| 1024 | + break; |
|
| 1025 | 1025 | |
| 1026 | - case 'G': |
|
| 1027 | - $dates .= $hour; |
|
| 1028 | - break; |
|
| 1026 | + case 'G': |
|
| 1027 | + $dates .= $hour; |
|
| 1028 | + break; |
|
| 1029 | 1029 | |
| 1030 | - case 'g': |
|
| 1031 | - if ($hour > 12) $hh = $hour - 12; |
|
| 1032 | - else { |
|
| 1033 | - if ($hour == 0) $hh = '12'; |
|
| 1034 | - else $hh = $hour; |
|
| 1035 | - } |
|
| 1036 | - $dates .= $hh; |
|
| 1037 | - break; |
|
| 1038 | - // MINUTES |
|
| 1039 | - case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break; |
|
| 1040 | - // SECONDS |
|
| 1041 | - case 'U': $dates .= $d; break; |
|
| 1042 | - case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break; |
|
| 1043 | - // AM/PM |
|
| 1044 | - // Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM |
|
| 1045 | - case 'a': |
|
| 1046 | - if ($hour>=12) $dates .= 'pm'; |
|
| 1047 | - else $dates .= 'am'; |
|
| 1048 | - break; |
|
| 1049 | - case 'A': |
|
| 1050 | - if ($hour>=12) $dates .= 'PM'; |
|
| 1051 | - else $dates .= 'AM'; |
|
| 1052 | - break; |
|
| 1053 | - default: |
|
| 1054 | - $dates .= $fmt[$i]; break; |
|
| 1055 | - // ESCAPE |
|
| 1056 | - case "\\": |
|
| 1057 | - $i++; |
|
| 1058 | - if ($i < $max) $dates .= $fmt[$i]; |
|
| 1059 | - break; |
|
| 1030 | + case 'g': |
|
| 1031 | + if ($hour > 12) $hh = $hour - 12; |
|
| 1032 | + else { |
|
| 1033 | + if ($hour == 0) $hh = '12'; |
|
| 1034 | + else $hh = $hour; |
|
| 1035 | + } |
|
| 1036 | + $dates .= $hh; |
|
| 1037 | + break; |
|
| 1038 | + // MINUTES |
|
| 1039 | + case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break; |
|
| 1040 | + // SECONDS |
|
| 1041 | + case 'U': $dates .= $d; break; |
|
| 1042 | + case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break; |
|
| 1043 | + // AM/PM |
|
| 1044 | + // Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM |
|
| 1045 | + case 'a': |
|
| 1046 | + if ($hour>=12) $dates .= 'pm'; |
|
| 1047 | + else $dates .= 'am'; |
|
| 1048 | + break; |
|
| 1049 | + case 'A': |
|
| 1050 | + if ($hour>=12) $dates .= 'PM'; |
|
| 1051 | + else $dates .= 'AM'; |
|
| 1052 | + break; |
|
| 1053 | + default: |
|
| 1054 | + $dates .= $fmt[$i]; break; |
|
| 1055 | + // ESCAPE |
|
| 1056 | + case "\\": |
|
| 1057 | + $i++; |
|
| 1058 | + if ($i < $max) $dates .= $fmt[$i]; |
|
| 1059 | + break; |
|
| 1060 | 1060 | } |
| 1061 | 1061 | } |
| 1062 | 1062 | return $dates; |
@@ -1222,55 +1222,55 @@ discard block |
||
| 1222 | 1222 | |
| 1223 | 1223 | $inpct = false; |
| 1224 | 1224 | switch($ch) { |
| 1225 | - case '0': |
|
| 1226 | - case '1': |
|
| 1227 | - case '2': |
|
| 1228 | - case '3': |
|
| 1229 | - case '4': |
|
| 1230 | - case '5': |
|
| 1231 | - case '6': |
|
| 1232 | - case '7': |
|
| 1233 | - case '8': |
|
| 1234 | - case '9': |
|
| 1235 | - case 'E': |
|
| 1236 | - case 'O': |
|
| 1237 | - /* ignore format modifiers */ |
|
| 1238 | - $inpct = true; |
|
| 1239 | - break; |
|
| 1225 | + case '0': |
|
| 1226 | + case '1': |
|
| 1227 | + case '2': |
|
| 1228 | + case '3': |
|
| 1229 | + case '4': |
|
| 1230 | + case '5': |
|
| 1231 | + case '6': |
|
| 1232 | + case '7': |
|
| 1233 | + case '8': |
|
| 1234 | + case '9': |
|
| 1235 | + case 'E': |
|
| 1236 | + case 'O': |
|
| 1237 | + /* ignore format modifiers */ |
|
| 1238 | + $inpct = true; |
|
| 1239 | + break; |
|
| 1240 | 1240 | |
| 1241 | - case 'a': $fmtdate .= 'D'; break; |
|
| 1242 | - case 'A': $fmtdate .= 'l'; break; |
|
| 1243 | - case 'h': |
|
| 1244 | - case 'b': $fmtdate .= 'M'; break; |
|
| 1245 | - case 'B': $fmtdate .= 'F'; break; |
|
| 1246 | - case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break; |
|
| 1247 | - case 'C': $fmtdate .= '\C?'; break; // century |
|
| 1248 | - case 'd': $fmtdate .= 'd'; break; |
|
| 1249 | - case 'D': $fmtdate .= 'm/d/y'; break; |
|
| 1250 | - case 'e': $fmtdate .= 'j'; break; |
|
| 1251 | - case 'g': $fmtdate .= '\g?'; break; //? |
|
| 1252 | - case 'G': $fmtdate .= '\G?'; break; //? |
|
| 1253 | - case 'H': $fmtdate .= 'H'; break; |
|
| 1254 | - case 'I': $fmtdate .= 'h'; break; |
|
| 1255 | - case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd |
|
| 1256 | - case 'm': $fmtdate .= 'm'; break; |
|
| 1257 | - case 'M': $fmtdate .= 'i'; break; |
|
| 1258 | - case 'n': $fmtdate .= "\n"; break; |
|
| 1259 | - case 'p': $fmtdate .= 'a'; break; |
|
| 1260 | - case 'r': $fmtdate .= 'h:i:s a'; break; |
|
| 1261 | - case 'R': $fmtdate .= 'H:i:s'; break; |
|
| 1262 | - case 'S': $fmtdate .= 's'; break; |
|
| 1263 | - case 't': $fmtdate .= "\t"; break; |
|
| 1264 | - case 'T': $fmtdate .= 'H:i:s'; break; |
|
| 1265 | - case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde |
|
| 1266 | - case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based |
|
| 1267 | - case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break; |
|
| 1268 | - case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break; |
|
| 1269 | - case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde |
|
| 1270 | - case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based |
|
| 1271 | - case 'y': $fmtdate .= 'y'; break; |
|
| 1272 | - case 'Y': $fmtdate .= 'Y'; break; |
|
| 1273 | - case 'Z': $fmtdate .= 'T'; break; |
|
| 1241 | + case 'a': $fmtdate .= 'D'; break; |
|
| 1242 | + case 'A': $fmtdate .= 'l'; break; |
|
| 1243 | + case 'h': |
|
| 1244 | + case 'b': $fmtdate .= 'M'; break; |
|
| 1245 | + case 'B': $fmtdate .= 'F'; break; |
|
| 1246 | + case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break; |
|
| 1247 | + case 'C': $fmtdate .= '\C?'; break; // century |
|
| 1248 | + case 'd': $fmtdate .= 'd'; break; |
|
| 1249 | + case 'D': $fmtdate .= 'm/d/y'; break; |
|
| 1250 | + case 'e': $fmtdate .= 'j'; break; |
|
| 1251 | + case 'g': $fmtdate .= '\g?'; break; //? |
|
| 1252 | + case 'G': $fmtdate .= '\G?'; break; //? |
|
| 1253 | + case 'H': $fmtdate .= 'H'; break; |
|
| 1254 | + case 'I': $fmtdate .= 'h'; break; |
|
| 1255 | + case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd |
|
| 1256 | + case 'm': $fmtdate .= 'm'; break; |
|
| 1257 | + case 'M': $fmtdate .= 'i'; break; |
|
| 1258 | + case 'n': $fmtdate .= "\n"; break; |
|
| 1259 | + case 'p': $fmtdate .= 'a'; break; |
|
| 1260 | + case 'r': $fmtdate .= 'h:i:s a'; break; |
|
| 1261 | + case 'R': $fmtdate .= 'H:i:s'; break; |
|
| 1262 | + case 'S': $fmtdate .= 's'; break; |
|
| 1263 | + case 't': $fmtdate .= "\t"; break; |
|
| 1264 | + case 'T': $fmtdate .= 'H:i:s'; break; |
|
| 1265 | + case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde |
|
| 1266 | + case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based |
|
| 1267 | + case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break; |
|
| 1268 | + case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break; |
|
| 1269 | + case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde |
|
| 1270 | + case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based |
|
| 1271 | + case 'y': $fmtdate .= 'y'; break; |
|
| 1272 | + case 'Y': $fmtdate .= 'Y'; break; |
|
| 1273 | + case 'Z': $fmtdate .= 'T'; break; |
|
| 1274 | 1274 | } |
| 1275 | 1275 | } else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' )) |
| 1276 | 1276 | $fmtdate .= "\\".$ch; |
@@ -165,16 +165,16 @@ |
||
| 165 | 165 | if (is_array($options)) { |
| 166 | 166 | foreach($options as $k => $v) { |
| 167 | 167 | switch(strtolower($k)) { |
| 168 | - case 'persist': |
|
| 169 | - case 'persistent': $persist = $v; break; |
|
| 170 | - #ibase |
|
| 171 | - case 'dialect': $obj->dialect = $v; break; |
|
| 172 | - case 'charset': $obj->charset = $v; break; |
|
| 173 | - case 'buffers': $obj->buffers = $v; break; |
|
| 174 | - #ado |
|
| 175 | - case 'charpage': $obj->charPage = $v; break; |
|
| 176 | - #mysql |
|
| 177 | - case 'clientflags': $obj->clientFlags = $v; break; |
|
| 168 | + case 'persist': |
|
| 169 | + case 'persistent': $persist = $v; break; |
|
| 170 | + #ibase |
|
| 171 | + case 'dialect': $obj->dialect = $v; break; |
|
| 172 | + case 'charset': $obj->charset = $v; break; |
|
| 173 | + case 'buffers': $obj->buffers = $v; break; |
|
| 174 | + #ado |
|
| 175 | + case 'charpage': $obj->charPage = $v; break; |
|
| 176 | + #mysql |
|
| 177 | + case 'clientflags': $obj->clientFlags = $v; break; |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | } else { |
@@ -1683,17 +1683,17 @@ discard block |
||
| 1683 | 1683 | $rs->tableName = $table; |
| 1684 | 1684 | |
| 1685 | 1685 | switch((string) $mode) { |
| 1686 | - case 'UPDATE': |
|
| 1687 | - case '2': |
|
| 1688 | - $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq); |
|
| 1689 | - break; |
|
| 1690 | - case 'INSERT': |
|
| 1691 | - case '1': |
|
| 1692 | - $sql = $this->GetInsertSQL($rs, $fields_values, $magicq); |
|
| 1693 | - break; |
|
| 1694 | - default: |
|
| 1695 | - ADOConnection::outp("AutoExecute: Unknown mode=$mode"); |
|
| 1696 | - return false; |
|
| 1686 | + case 'UPDATE': |
|
| 1687 | + case '2': |
|
| 1688 | + $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq); |
|
| 1689 | + break; |
|
| 1690 | + case 'INSERT': |
|
| 1691 | + case '1': |
|
| 1692 | + $sql = $this->GetInsertSQL($rs, $fields_values, $magicq); |
|
| 1693 | + break; |
|
| 1694 | + default: |
|
| 1695 | + ADOConnection::outp("AutoExecute: Unknown mode=$mode"); |
|
| 1696 | + return false; |
|
| 1697 | 1697 | } |
| 1698 | 1698 | $ret = false; |
| 1699 | 1699 | if ($sql) $ret = $this->Execute($sql); |
@@ -3338,35 +3338,35 @@ discard block |
||
| 3338 | 3338 | $t = strtoupper($t); |
| 3339 | 3339 | $tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N'; |
| 3340 | 3340 | switch ($tmap) { |
| 3341 | - case 'C': |
|
| 3341 | + case 'C': |
|
| 3342 | 3342 | |
| 3343 | - // is the char field is too long, return as text field... |
|
| 3344 | - if ($this->blobSize >= 0) { |
|
| 3345 | - if ($len > $this->blobSize) return 'X'; |
|
| 3346 | - } else if ($len > 250) { |
|
| 3347 | - return 'X'; |
|
| 3348 | - } |
|
| 3349 | - return 'C'; |
|
| 3343 | + // is the char field is too long, return as text field... |
|
| 3344 | + if ($this->blobSize >= 0) { |
|
| 3345 | + if ($len > $this->blobSize) return 'X'; |
|
| 3346 | + } else if ($len > 250) { |
|
| 3347 | + return 'X'; |
|
| 3348 | + } |
|
| 3349 | + return 'C'; |
|
| 3350 | 3350 | |
| 3351 | - case 'I': |
|
| 3352 | - if (!empty($fieldobj->primary_key)) return 'R'; |
|
| 3353 | - return 'I'; |
|
| 3351 | + case 'I': |
|
| 3352 | + if (!empty($fieldobj->primary_key)) return 'R'; |
|
| 3353 | + return 'I'; |
|
| 3354 | 3354 | |
| 3355 | - case false: |
|
| 3356 | - return 'N'; |
|
| 3355 | + case false: |
|
| 3356 | + return 'N'; |
|
| 3357 | 3357 | |
| 3358 | - case 'B': |
|
| 3359 | - if (isset($fieldobj->binary)) |
|
| 3360 | - return ($fieldobj->binary) ? 'B' : 'X'; |
|
| 3361 | - return 'B'; |
|
| 3358 | + case 'B': |
|
| 3359 | + if (isset($fieldobj->binary)) |
|
| 3360 | + return ($fieldobj->binary) ? 'B' : 'X'; |
|
| 3361 | + return 'B'; |
|
| 3362 | 3362 | |
| 3363 | - case 'D': |
|
| 3364 | - if (!empty($this->datetime)) return 'T'; |
|
| 3365 | - return 'D'; |
|
| 3363 | + case 'D': |
|
| 3364 | + if (!empty($this->datetime)) return 'T'; |
|
| 3365 | + return 'D'; |
|
| 3366 | 3366 | |
| 3367 | - default: |
|
| 3368 | - if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B'; |
|
| 3369 | - return $tmap; |
|
| 3367 | + default: |
|
| 3368 | + if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B'; |
|
| 3369 | + return $tmap; |
|
| 3370 | 3370 | } |
| 3371 | 3371 | } |
| 3372 | 3372 | |
@@ -3793,25 +3793,25 @@ discard block |
||
| 3793 | 3793 | if (isset($dsna['port'])) $obj->port = $dsna['port']; |
| 3794 | 3794 | foreach($opt as $k => $v) { |
| 3795 | 3795 | switch(strtolower($k)) { |
| 3796 | - case 'persist': |
|
| 3797 | - case 'persistent': $persist = $v; break; |
|
| 3798 | - case 'debug': $obj->debug = (integer) $v; break; |
|
| 3799 | - #ibase |
|
| 3800 | - case 'role': $obj->role = $v; break; |
|
| 3801 | - case 'dialect': $obj->dialect = (integer) $v; break; |
|
| 3802 | - case 'charset': $obj->charset = $v; $obj->charSet=$v; break; |
|
| 3803 | - case 'buffers': $obj->buffers = $v; break; |
|
| 3804 | - case 'fetchmode': $obj->SetFetchMode($v); break; |
|
| 3805 | - #ado |
|
| 3806 | - case 'charpage': $obj->charPage = $v; break; |
|
| 3807 | - #mysql, mysqli |
|
| 3808 | - case 'clientflags': $obj->clientFlags = $v; break; |
|
| 3809 | - #mysql, mysqli, postgres |
|
| 3810 | - case 'port': $obj->port = $v; break; |
|
| 3811 | - #mysqli |
|
| 3812 | - case 'socket': $obj->socket = $v; break; |
|
| 3813 | - #oci8 |
|
| 3814 | - case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break; |
|
| 3796 | + case 'persist': |
|
| 3797 | + case 'persistent': $persist = $v; break; |
|
| 3798 | + case 'debug': $obj->debug = (integer) $v; break; |
|
| 3799 | + #ibase |
|
| 3800 | + case 'role': $obj->role = $v; break; |
|
| 3801 | + case 'dialect': $obj->dialect = (integer) $v; break; |
|
| 3802 | + case 'charset': $obj->charset = $v; $obj->charSet=$v; break; |
|
| 3803 | + case 'buffers': $obj->buffers = $v; break; |
|
| 3804 | + case 'fetchmode': $obj->SetFetchMode($v); break; |
|
| 3805 | + #ado |
|
| 3806 | + case 'charpage': $obj->charPage = $v; break; |
|
| 3807 | + #mysql, mysqli |
|
| 3808 | + case 'clientflags': $obj->clientFlags = $v; break; |
|
| 3809 | + #mysql, mysqli, postgres |
|
| 3810 | + case 'port': $obj->port = $v; break; |
|
| 3811 | + #mysqli |
|
| 3812 | + case 'socket': $obj->socket = $v; break; |
|
| 3813 | + #oci8 |
|
| 3814 | + case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break; |
|
| 3815 | 3815 | } |
| 3816 | 3816 | } |
| 3817 | 3817 | if (empty($persist)) |
@@ -3831,24 +3831,24 @@ discard block |
||
| 3831 | 3831 | function _adodb_getdriver($provider,$drivername,$perf=false) |
| 3832 | 3832 | { |
| 3833 | 3833 | switch ($provider) { |
| 3834 | - case 'odbtp': if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); |
|
| 3835 | - case 'odbc' : if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); |
|
| 3836 | - case 'ado' : if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4); |
|
| 3837 | - case 'native': break; |
|
| 3838 | - default: |
|
| 3839 | - return $provider; |
|
| 3834 | + case 'odbtp': if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); |
|
| 3835 | + case 'odbc' : if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); |
|
| 3836 | + case 'ado' : if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4); |
|
| 3837 | + case 'native': break; |
|
| 3838 | + default: |
|
| 3839 | + return $provider; |
|
| 3840 | 3840 | } |
| 3841 | 3841 | |
| 3842 | 3842 | switch($drivername) { |
| 3843 | - case 'firebird15': $drivername = 'firebird'; break; |
|
| 3844 | - case 'oracle': $drivername = 'oci8'; break; |
|
| 3845 | - case 'access': if ($perf) $drivername = ''; break; |
|
| 3846 | - case 'db2' : break; |
|
| 3847 | - case 'sapdb' : break; |
|
| 3848 | - case 'mysqli': $drivername = 'mysql'; break; |
|
| 3849 | - default: |
|
| 3850 | - $drivername = 'generic'; |
|
| 3851 | - break; |
|
| 3843 | + case 'firebird15': $drivername = 'firebird'; break; |
|
| 3844 | + case 'oracle': $drivername = 'oci8'; break; |
|
| 3845 | + case 'access': if ($perf) $drivername = ''; break; |
|
| 3846 | + case 'db2' : break; |
|
| 3847 | + case 'sapdb' : break; |
|
| 3848 | + case 'mysqli': $drivername = 'mysql'; break; |
|
| 3849 | + default: |
|
| 3850 | + $drivername = 'generic'; |
|
| 3851 | + break; |
|
| 3852 | 3852 | } |
| 3853 | 3853 | return $drivername; |
| 3854 | 3854 | } |
@@ -533,10 +533,10 @@ |
||
| 533 | 533 | |
| 534 | 534 | if ($persist) { |
| 535 | 535 | switch($persist) { |
| 536 | - default: |
|
| 537 | - case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break; |
|
| 538 | - case 'C': $ok = $conn->Connect($host, $user, $password, $database); break; |
|
| 539 | - case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break; |
|
| 536 | + default: |
|
| 537 | + case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break; |
|
| 538 | + case 'C': $ok = $conn->Connect($host, $user, $password, $database); break; |
|
| 539 | + case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break; |
|
| 540 | 540 | } |
| 541 | 541 | } else { |
| 542 | 542 | $ok = $conn->Connect($host, $user, $password, $database); |
@@ -45,24 +45,24 @@ |
||
| 45 | 45 | |
| 46 | 46 | if (error_reporting() == 0) return; // obey @ protocol |
| 47 | 47 | switch($fn) { |
| 48 | - case 'EXECUTE': |
|
| 49 | - $sql = $p1; |
|
| 50 | - $inputparams = $p2; |
|
| 48 | + case 'EXECUTE': |
|
| 49 | + $sql = $p1; |
|
| 50 | + $inputparams = $p2; |
|
| 51 | 51 | |
| 52 | - $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")"; |
|
| 53 | - break; |
|
| 52 | + $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")"; |
|
| 53 | + break; |
|
| 54 | 54 | |
| 55 | - case 'PCONNECT': |
|
| 56 | - case 'CONNECT': |
|
| 57 | - $host = $p1; |
|
| 58 | - $database = $p2; |
|
| 55 | + case 'PCONNECT': |
|
| 56 | + case 'CONNECT': |
|
| 57 | + $host = $p1; |
|
| 58 | + $database = $p2; |
|
| 59 | 59 | |
| 60 | - $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')"; |
|
| 61 | - break; |
|
| 60 | + $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')"; |
|
| 61 | + break; |
|
| 62 | 62 | |
| 63 | - default: |
|
| 64 | - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)"; |
|
| 65 | - break; |
|
| 63 | + default: |
|
| 64 | + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)"; |
|
| 65 | + break; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $class = ADODB_PEAR_ERROR_CLASS; |