@@ -72,50 +72,50 @@ |
||
| 72 | 72 | if ($s) $s .= '+'; |
| 73 | 73 | $ch = $fmt[$i]; |
| 74 | 74 | switch ($ch) { |
| 75 | - case 'Y': |
|
| 76 | - case 'y': |
|
| 77 | - $s .= "datename(yyyy,$col)"; |
|
| 78 | - break; |
|
| 79 | - case 'M': |
|
| 80 | - $s .= "convert(char(3),$col,0)"; |
|
| 81 | - break; |
|
| 82 | - case 'm': |
|
| 83 | - $s .= "replace(str(month($col),2),' ','0')"; |
|
| 84 | - break; |
|
| 85 | - case 'Q': |
|
| 86 | - case 'q': |
|
| 87 | - $s .= "datename(quarter,$col)"; |
|
| 88 | - break; |
|
| 89 | - case 'D': |
|
| 90 | - case 'd': |
|
| 91 | - $s .= "replace(str(day($col),2),' ','0')"; |
|
| 92 | - break; |
|
| 93 | - case 'h': |
|
| 94 | - $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
| 95 | - break; |
|
| 96 | - |
|
| 97 | - case 'H': |
|
| 98 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
| 99 | - break; |
|
| 100 | - |
|
| 101 | - case 'i': |
|
| 102 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
| 103 | - break; |
|
| 104 | - case 's': |
|
| 105 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
| 106 | - break; |
|
| 107 | - case 'a': |
|
| 108 | - case 'A': |
|
| 109 | - $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
| 110 | - break; |
|
| 111 | - |
|
| 112 | - default: |
|
| 113 | - if ($ch == '\\') { |
|
| 114 | - $i++; |
|
| 115 | - $ch = substr($fmt, $i, 1); |
|
| 116 | - } |
|
| 117 | - $s .= $ch; |
|
| 118 | - break; |
|
| 75 | + case 'Y': |
|
| 76 | + case 'y': |
|
| 77 | + $s .= "datename(yyyy,$col)"; |
|
| 78 | + break; |
|
| 79 | + case 'M': |
|
| 80 | + $s .= "convert(char(3),$col,0)"; |
|
| 81 | + break; |
|
| 82 | + case 'm': |
|
| 83 | + $s .= "replace(str(month($col),2),' ','0')"; |
|
| 84 | + break; |
|
| 85 | + case 'Q': |
|
| 86 | + case 'q': |
|
| 87 | + $s .= "datename(quarter,$col)"; |
|
| 88 | + break; |
|
| 89 | + case 'D': |
|
| 90 | + case 'd': |
|
| 91 | + $s .= "replace(str(day($col),2),' ','0')"; |
|
| 92 | + break; |
|
| 93 | + case 'h': |
|
| 94 | + $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
| 95 | + break; |
|
| 96 | + |
|
| 97 | + case 'H': |
|
| 98 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
| 99 | + break; |
|
| 100 | + |
|
| 101 | + case 'i': |
|
| 102 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
| 103 | + break; |
|
| 104 | + case 's': |
|
| 105 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
| 106 | + break; |
|
| 107 | + case 'a': |
|
| 108 | + case 'A': |
|
| 109 | + $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
| 110 | + break; |
|
| 111 | + |
|
| 112 | + default: |
|
| 113 | + if ($ch == '\\') { |
|
| 114 | + $i++; |
|
| 115 | + $ch = substr($fmt, $i, 1); |
|
| 116 | + } |
|
| 117 | + $s .= $ch; |
|
| 118 | + break; |
|
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | return $s; |
@@ -66,7 +66,9 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | function sqlDate($fmt, $col = false) |
| 68 | 68 | { |
| 69 | - if (!$col) $col = 'now()'; |
|
| 69 | + if (!$col) { |
|
| 70 | + $col = 'now()'; |
|
| 71 | + } |
|
| 70 | 72 | $s = 'DATE_FORMAT(' . $col . ",'"; |
| 71 | 73 | $concat = false; |
| 72 | 74 | $len = strlen($fmt); |
@@ -81,8 +83,11 @@ discard block |
||
| 81 | 83 | case 'q': |
| 82 | 84 | $s .= "'),Quarter($col)"; |
| 83 | 85 | |
| 84 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
| 85 | - else $s .= ",('"; |
|
| 86 | + if ($len > $i + 1) { |
|
| 87 | + $s .= ",DATE_FORMAT($col,'"; |
|
| 88 | + } else { |
|
| 89 | + $s .= ",('"; |
|
| 90 | + } |
|
| 86 | 91 | $concat = true; |
| 87 | 92 | break; |
| 88 | 93 | case 'M': |
@@ -129,7 +134,9 @@ discard block |
||
| 129 | 134 | } |
| 130 | 135 | } |
| 131 | 136 | $s.="')"; |
| 132 | - if ($concat) $s = "CONCAT($s)"; |
|
| 137 | + if ($concat) { |
|
| 138 | + $s = "CONCAT($s)"; |
|
| 139 | + } |
|
| 133 | 140 | return $s; |
| 134 | 141 | } |
| 135 | 142 | |
@@ -64,7 +64,9 @@ |
||
| 64 | 64 | */ |
| 65 | 65 | function sqlDate($fmt, $col = false) |
| 66 | 66 | { |
| 67 | - if (!$col) $col = 'current_timestamp'; |
|
| 67 | + if (!$col) { |
|
| 68 | + $col = 'current_timestamp'; |
|
| 69 | + } |
|
| 68 | 70 | $s = 'TO_CHAR(' . $col . ",'"; |
| 69 | 71 | |
| 70 | 72 | $len = strlen($fmt); |