@@ -56,7 +56,7 @@ |
||
56 | 56 | sqlrcur_prepareQuery($cur, $sql); |
57 | 57 | $bindCount = 1; |
58 | 58 | foreach ($array as $key => $value) { |
59 | - $field = strval($bindCount ++); |
|
59 | + $field = strval($bindCount++); |
|
60 | 60 | sqlrcur_inputBind($cur, $field, $value); |
61 | 61 | } |
62 | 62 | $success = sqlrcur_executeQuery($cur); |
@@ -76,50 +76,50 @@ |
||
76 | 76 | if ($s) $s .= '+'; |
77 | 77 | $ch = $fmt[$i]; |
78 | 78 | switch ($ch) { |
79 | - case 'Y': |
|
80 | - case 'y': |
|
81 | - $s .= "datename(yyyy,$col)"; |
|
82 | - break; |
|
83 | - case 'M': |
|
84 | - $s .= "convert(char(3),$col,0)"; |
|
85 | - break; |
|
86 | - case 'm': |
|
87 | - $s .= "replace(str(month($col),2),' ','0')"; |
|
88 | - break; |
|
89 | - case 'Q': |
|
90 | - case 'q': |
|
91 | - $s .= "datename(quarter,$col)"; |
|
92 | - break; |
|
93 | - case 'D': |
|
94 | - case 'd': |
|
95 | - $s .= "replace(str(day($col),2),' ','0')"; |
|
96 | - break; |
|
97 | - case 'h': |
|
98 | - $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
99 | - break; |
|
100 | - |
|
101 | - case 'H': |
|
102 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
103 | - break; |
|
104 | - |
|
105 | - case 'i': |
|
106 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
107 | - break; |
|
108 | - case 's': |
|
109 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
110 | - break; |
|
111 | - case 'a': |
|
112 | - case 'A': |
|
113 | - $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
114 | - break; |
|
115 | - |
|
116 | - default: |
|
117 | - if ($ch == '\\') { |
|
118 | - $i++; |
|
119 | - $ch = substr($fmt, $i, 1); |
|
120 | - } |
|
121 | - $s .= $this->qstr($ch); |
|
122 | - break; |
|
79 | + case 'Y': |
|
80 | + case 'y': |
|
81 | + $s .= "datename(yyyy,$col)"; |
|
82 | + break; |
|
83 | + case 'M': |
|
84 | + $s .= "convert(char(3),$col,0)"; |
|
85 | + break; |
|
86 | + case 'm': |
|
87 | + $s .= "replace(str(month($col),2),' ','0')"; |
|
88 | + break; |
|
89 | + case 'Q': |
|
90 | + case 'q': |
|
91 | + $s .= "datename(quarter,$col)"; |
|
92 | + break; |
|
93 | + case 'D': |
|
94 | + case 'd': |
|
95 | + $s .= "replace(str(day($col),2),' ','0')"; |
|
96 | + break; |
|
97 | + case 'h': |
|
98 | + $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
99 | + break; |
|
100 | + |
|
101 | + case 'H': |
|
102 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
103 | + break; |
|
104 | + |
|
105 | + case 'i': |
|
106 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
107 | + break; |
|
108 | + case 's': |
|
109 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
110 | + break; |
|
111 | + case 'a': |
|
112 | + case 'A': |
|
113 | + $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
114 | + break; |
|
115 | + |
|
116 | + default: |
|
117 | + if ($ch == '\\') { |
|
118 | + $i++; |
|
119 | + $ch = substr($fmt, $i, 1); |
|
120 | + } |
|
121 | + $s .= $this->qstr($ch); |
|
122 | + break; |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | return $s; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { |
14 | 14 | $var = func_get_arg($i); |
15 | - $sql .= ($i == 0 ? "" : "+") . $var; |
|
15 | + $sql .= ($i == 0 ? "" : "+").$var; |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | return $sql; |
@@ -76,59 +76,59 @@ |
||
76 | 76 | for ($i = 0; $i < $len; $i++) { |
77 | 77 | $ch = $fmt[$i]; |
78 | 78 | switch ($ch) { |
79 | - case 'Y': |
|
80 | - case 'y': |
|
81 | - $s .= 'YYYY'; |
|
82 | - break; |
|
83 | - case 'Q': |
|
84 | - case 'q': |
|
85 | - $s .= 'Q'; |
|
86 | - break; |
|
87 | - |
|
88 | - case 'M': |
|
89 | - $s .= 'Mon'; |
|
90 | - break; |
|
91 | - |
|
92 | - case 'm': |
|
93 | - $s .= 'MM'; |
|
94 | - break; |
|
95 | - case 'D': |
|
96 | - case 'd': |
|
97 | - $s .= 'DD'; |
|
98 | - break; |
|
99 | - |
|
100 | - case 'H': |
|
101 | - $s.= 'HH24'; |
|
102 | - break; |
|
103 | - |
|
104 | - case 'h': |
|
105 | - $s .= 'HH'; |
|
106 | - break; |
|
107 | - |
|
108 | - case 'i': |
|
109 | - $s .= 'MI'; |
|
110 | - break; |
|
111 | - |
|
112 | - case 's': |
|
113 | - $s .= 'SS'; |
|
114 | - break; |
|
115 | - |
|
116 | - case 'a': |
|
117 | - case 'A': |
|
118 | - $s .= 'AM'; |
|
119 | - break; |
|
120 | - |
|
121 | - default: |
|
122 | - // handle escape characters... |
|
123 | - if ($ch == '\\') { |
|
124 | - $i++; |
|
125 | - $ch = substr($fmt, $i, 1); |
|
126 | - } |
|
127 | - if (strpos('-/.:;, ', $ch) !== false) { |
|
128 | - $s .= $ch; |
|
129 | - } else { |
|
130 | - $s .= '"' . $ch . '"'; |
|
131 | - } |
|
79 | + case 'Y': |
|
80 | + case 'y': |
|
81 | + $s .= 'YYYY'; |
|
82 | + break; |
|
83 | + case 'Q': |
|
84 | + case 'q': |
|
85 | + $s .= 'Q'; |
|
86 | + break; |
|
87 | + |
|
88 | + case 'M': |
|
89 | + $s .= 'Mon'; |
|
90 | + break; |
|
91 | + |
|
92 | + case 'm': |
|
93 | + $s .= 'MM'; |
|
94 | + break; |
|
95 | + case 'D': |
|
96 | + case 'd': |
|
97 | + $s .= 'DD'; |
|
98 | + break; |
|
99 | + |
|
100 | + case 'H': |
|
101 | + $s.= 'HH24'; |
|
102 | + break; |
|
103 | + |
|
104 | + case 'h': |
|
105 | + $s .= 'HH'; |
|
106 | + break; |
|
107 | + |
|
108 | + case 'i': |
|
109 | + $s .= 'MI'; |
|
110 | + break; |
|
111 | + |
|
112 | + case 's': |
|
113 | + $s .= 'SS'; |
|
114 | + break; |
|
115 | + |
|
116 | + case 'a': |
|
117 | + case 'A': |
|
118 | + $s .= 'AM'; |
|
119 | + break; |
|
120 | + |
|
121 | + default: |
|
122 | + // handle escape characters... |
|
123 | + if ($ch == '\\') { |
|
124 | + $i++; |
|
125 | + $ch = substr($fmt, $i, 1); |
|
126 | + } |
|
127 | + if (strpos('-/.:;, ', $ch) !== false) { |
|
128 | + $s .= $ch; |
|
129 | + } else { |
|
130 | + $s .= '"' . $ch . '"'; |
|
131 | + } |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | return $s . "')"; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | $sql = ""; |
11 | 11 | for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { |
12 | 12 | $var = func_get_arg($i); |
13 | - $sql .= ($i == 0 ? "" : " || ") . $var; |
|
13 | + $sql .= ($i == 0 ? "" : " || ").$var; |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | return $sql; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | function limit($sql, $start, $qty) |
27 | 27 | { |
28 | 28 | if (strpos($sql, ' LIMIT ') === false) { |
29 | - return $sql . " LIMIT $qty OFFSET $start "; |
|
29 | + return $sql." LIMIT $qty OFFSET $start "; |
|
30 | 30 | } else { |
31 | 31 | return $sql; |
32 | 32 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | function sqlDate($fmt, $col = false) |
72 | 72 | { |
73 | 73 | if (!$col) $col = $this->sysTimeStamp; |
74 | - $s = 'TO_CHAR(' . $col . ",'"; |
|
74 | + $s = 'TO_CHAR('.$col.",'"; |
|
75 | 75 | |
76 | 76 | $len = strlen($fmt); |
77 | 77 | for ($i = 0; $i < $len; $i++) { |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | break; |
100 | 100 | |
101 | 101 | case 'H': |
102 | - $s.= 'HH24'; |
|
102 | + $s .= 'HH24'; |
|
103 | 103 | break; |
104 | 104 | |
105 | 105 | case 'h': |
@@ -128,11 +128,11 @@ discard block |
||
128 | 128 | if (strpos('-/.:;, ', $ch) !== false) { |
129 | 129 | $s .= $ch; |
130 | 130 | } else { |
131 | - $s .= '"' . $ch . '"'; |
|
131 | + $s .= '"'.$ch.'"'; |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | } |
135 | - return $s . "')"; |
|
135 | + return $s."')"; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -82,59 +82,59 @@ |
||
82 | 82 | for ($i = 0; $i < $len; $i++) { |
83 | 83 | $ch = $fmt[$i]; |
84 | 84 | switch ($ch) { |
85 | - case 'Y': |
|
86 | - case 'y': |
|
87 | - $s .= '%Y'; |
|
88 | - break; |
|
89 | - case 'Q': |
|
90 | - case 'q': |
|
91 | - $s .= "'),Quarter($col)"; |
|
92 | - |
|
93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
94 | - else $s .= ",('"; |
|
95 | - $concat = true; |
|
96 | - break; |
|
97 | - case 'M': |
|
98 | - $s .= '%b'; |
|
99 | - break; |
|
100 | - |
|
101 | - case 'm': |
|
102 | - $s .= '%m'; |
|
103 | - break; |
|
104 | - case 'D': |
|
105 | - case 'd': |
|
106 | - $s .= '%d'; |
|
107 | - break; |
|
108 | - |
|
109 | - case 'H': |
|
110 | - $s .= '%H'; |
|
111 | - break; |
|
112 | - |
|
113 | - case 'h': |
|
114 | - $s .= '%I'; |
|
115 | - break; |
|
116 | - |
|
117 | - case 'i': |
|
118 | - $s .= '%i'; |
|
119 | - break; |
|
120 | - |
|
121 | - case 's': |
|
122 | - $s .= '%s'; |
|
123 | - break; |
|
124 | - |
|
125 | - case 'a': |
|
126 | - case 'A': |
|
127 | - $s .= '%p'; |
|
128 | - break; |
|
129 | - |
|
130 | - default: |
|
131 | - |
|
132 | - if ($ch == '\\') { |
|
133 | - $i++; |
|
134 | - $ch = substr($fmt, $i, 1); |
|
135 | - } |
|
136 | - $s .= $ch; |
|
137 | - break; |
|
85 | + case 'Y': |
|
86 | + case 'y': |
|
87 | + $s .= '%Y'; |
|
88 | + break; |
|
89 | + case 'Q': |
|
90 | + case 'q': |
|
91 | + $s .= "'),Quarter($col)"; |
|
92 | + |
|
93 | + if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
94 | + else $s .= ",('"; |
|
95 | + $concat = true; |
|
96 | + break; |
|
97 | + case 'M': |
|
98 | + $s .= '%b'; |
|
99 | + break; |
|
100 | + |
|
101 | + case 'm': |
|
102 | + $s .= '%m'; |
|
103 | + break; |
|
104 | + case 'D': |
|
105 | + case 'd': |
|
106 | + $s .= '%d'; |
|
107 | + break; |
|
108 | + |
|
109 | + case 'H': |
|
110 | + $s .= '%H'; |
|
111 | + break; |
|
112 | + |
|
113 | + case 'h': |
|
114 | + $s .= '%I'; |
|
115 | + break; |
|
116 | + |
|
117 | + case 'i': |
|
118 | + $s .= '%i'; |
|
119 | + break; |
|
120 | + |
|
121 | + case 's': |
|
122 | + $s .= '%s'; |
|
123 | + break; |
|
124 | + |
|
125 | + case 'a': |
|
126 | + case 'A': |
|
127 | + $s .= '%p'; |
|
128 | + break; |
|
129 | + |
|
130 | + default: |
|
131 | + |
|
132 | + if ($ch == '\\') { |
|
133 | + $i++; |
|
134 | + $ch = substr($fmt, $i, 1); |
|
135 | + } |
|
136 | + $s .= $ch; |
|
137 | + break; |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | $s.="')"; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $sql = "concat("; |
15 | 15 | for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) { |
16 | 16 | $var = func_get_arg($i); |
17 | - $sql .= ($i == 0 ? "" : ",") . $var; |
|
17 | + $sql .= ($i == 0 ? "" : ",").$var; |
|
18 | 18 | } |
19 | 19 | $sql .= ")"; |
20 | 20 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | function limit($sql, $start, $qty) |
32 | 32 | { |
33 | 33 | if (strpos($sql, ' LIMIT ') === false) { |
34 | - return $sql . " LIMIT $start, $qty "; |
|
34 | + return $sql." LIMIT $start, $qty "; |
|
35 | 35 | } else { |
36 | 36 | return $sql; |
37 | 37 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | function sqlDate($fmt, $col = false) |
77 | 77 | { |
78 | 78 | if (!$col) $col = $this->sysTimeStamp; |
79 | - $s = 'DATE_FORMAT(' . $col . ",'"; |
|
79 | + $s = 'DATE_FORMAT('.$col.",'"; |
|
80 | 80 | $concat = false; |
81 | 81 | $len = strlen($fmt); |
82 | 82 | for ($i = 0; $i < $len; $i++) { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | break; |
138 | 138 | } |
139 | 139 | } |
140 | - $s.="')"; |
|
140 | + $s .= "')"; |
|
141 | 141 | if ($concat) $s = "CONCAT($s)"; |
142 | 142 | return $s; |
143 | 143 | } |
@@ -23,27 +23,27 @@ |
||
23 | 23 | $lastError = json_last_error(); |
24 | 24 | $lastErrorDesc = ""; |
25 | 25 | switch ($lastError) { |
26 | - case JSON_ERROR_NONE: |
|
27 | - $lastErrorDesc = 'No errors'; |
|
28 | - break; |
|
29 | - case JSON_ERROR_DEPTH: |
|
30 | - $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
31 | - break; |
|
32 | - case JSON_ERROR_STATE_MISMATCH: |
|
33 | - $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
34 | - break; |
|
35 | - case JSON_ERROR_CTRL_CHAR: |
|
36 | - $lastErrorDesc = 'Unexpected control character found'; |
|
37 | - break; |
|
38 | - case JSON_ERROR_SYNTAX: |
|
39 | - $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
40 | - break; |
|
41 | - case JSON_ERROR_UTF8: |
|
42 | - $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
43 | - break; |
|
44 | - default: |
|
45 | - $lastErrorDesc = 'Unknown error'; |
|
46 | - break; |
|
26 | + case JSON_ERROR_NONE: |
|
27 | + $lastErrorDesc = 'No errors'; |
|
28 | + break; |
|
29 | + case JSON_ERROR_DEPTH: |
|
30 | + $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
31 | + break; |
|
32 | + case JSON_ERROR_STATE_MISMATCH: |
|
33 | + $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
34 | + break; |
|
35 | + case JSON_ERROR_CTRL_CHAR: |
|
36 | + $lastErrorDesc = 'Unexpected control character found'; |
|
37 | + break; |
|
38 | + case JSON_ERROR_SYNTAX: |
|
39 | + $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
40 | + break; |
|
41 | + case JSON_ERROR_UTF8: |
|
42 | + $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
43 | + break; |
|
44 | + default: |
|
45 | + $lastErrorDesc = 'Unknown error'; |
|
46 | + break; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($lastError != JSON_ERROR_NONE) { |
@@ -47,7 +47,7 @@ |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($lastError != JSON_ERROR_NONE) { |
50 | - throw new DatasetException("Invalid JSON string: " . $lastErrorDesc); |
|
50 | + throw new DatasetException("Invalid JSON string: ".$lastErrorDesc); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 |
@@ -141,38 +141,38 @@ discard block |
||
141 | 141 | |
142 | 142 | $result = ""; |
143 | 143 | switch ($relation) { |
144 | - case Relation::EQUAL: { |
|
145 | - $result = $field . "=" . $value; |
|
146 | - break; |
|
147 | - } |
|
148 | - case Relation::GREATER_THAN: { |
|
149 | - $result = $field . ">" . $value; |
|
150 | - break; |
|
151 | - } |
|
152 | - case Relation::LESS_THAN: { |
|
153 | - $result = $field . "<" . $value; |
|
154 | - break; |
|
155 | - } |
|
156 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
157 | - $result = $field . ">=" . $value; |
|
158 | - break; |
|
159 | - } |
|
160 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
161 | - $result = $field . "<=" . $value; |
|
162 | - break; |
|
163 | - } |
|
164 | - case Relation::NOT_EQUAL: { |
|
165 | - $result = $field . "!=" . $value; |
|
166 | - break; |
|
167 | - } |
|
168 | - case Relation::STARTS_WITH: { |
|
169 | - $result = " starts-with($field, $value) "; |
|
170 | - break; |
|
171 | - } |
|
172 | - case Relation::CONTAINS: { |
|
173 | - $result = " contains($field, $value) "; |
|
174 | - break; |
|
175 | - } |
|
144 | + case Relation::EQUAL: { |
|
145 | + $result = $field . "=" . $value; |
|
146 | + break; |
|
147 | + } |
|
148 | + case Relation::GREATER_THAN: { |
|
149 | + $result = $field . ">" . $value; |
|
150 | + break; |
|
151 | + } |
|
152 | + case Relation::LESS_THAN: { |
|
153 | + $result = $field . "<" . $value; |
|
154 | + break; |
|
155 | + } |
|
156 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
157 | + $result = $field . ">=" . $value; |
|
158 | + break; |
|
159 | + } |
|
160 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
161 | + $result = $field . "<=" . $value; |
|
162 | + break; |
|
163 | + } |
|
164 | + case Relation::NOT_EQUAL: { |
|
165 | + $result = $field . "!=" . $value; |
|
166 | + break; |
|
167 | + } |
|
168 | + case Relation::STARTS_WITH: { |
|
169 | + $result = " starts-with($field, $value) "; |
|
170 | + break; |
|
171 | + } |
|
172 | + case Relation::CONTAINS: { |
|
173 | + $result = " contains($field, $value) "; |
|
174 | + break; |
|
175 | + } |
|
176 | 176 | } |
177 | 177 | return $result; |
178 | 178 | } |
@@ -200,40 +200,40 @@ discard block |
||
200 | 200 | $field = " $name "; |
201 | 201 | $valueparam = " [[" . $paramName . "]] "; |
202 | 202 | switch ($relation) { |
203 | - case Relation::EQUAL: { |
|
204 | - $result = $field . "=" . $valueparam; |
|
205 | - break; |
|
206 | - } |
|
207 | - case Relation::GREATER_THAN: { |
|
208 | - $result = $field . ">" . $valueparam; |
|
209 | - break; |
|
210 | - } |
|
211 | - case Relation::LESS_THAN: { |
|
212 | - $result = $field . "<" . $valueparam; |
|
213 | - break; |
|
214 | - } |
|
215 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
216 | - $result = $field . ">=" . $valueparam; |
|
217 | - break; |
|
218 | - } |
|
219 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
220 | - $result = $field . "<=" . $valueparam; |
|
221 | - break; |
|
222 | - } |
|
223 | - case Relation::NOT_EQUAL: { |
|
224 | - $result = $field . "!=" . $valueparam; |
|
225 | - break; |
|
226 | - } |
|
227 | - case Relation::STARTS_WITH: { |
|
228 | - $param[$paramName] = $value . "%"; |
|
229 | - $result = $field . " like " . $valueparam; |
|
230 | - break; |
|
231 | - } |
|
232 | - case Relation::CONTAINS: { |
|
233 | - $param[$paramName] = "%" . $value . "%"; |
|
234 | - $result = $field . " like " . $valueparam; |
|
235 | - break; |
|
236 | - } |
|
203 | + case Relation::EQUAL: { |
|
204 | + $result = $field . "=" . $valueparam; |
|
205 | + break; |
|
206 | + } |
|
207 | + case Relation::GREATER_THAN: { |
|
208 | + $result = $field . ">" . $valueparam; |
|
209 | + break; |
|
210 | + } |
|
211 | + case Relation::LESS_THAN: { |
|
212 | + $result = $field . "<" . $valueparam; |
|
213 | + break; |
|
214 | + } |
|
215 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
216 | + $result = $field . ">=" . $valueparam; |
|
217 | + break; |
|
218 | + } |
|
219 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
220 | + $result = $field . "<=" . $valueparam; |
|
221 | + break; |
|
222 | + } |
|
223 | + case Relation::NOT_EQUAL: { |
|
224 | + $result = $field . "!=" . $valueparam; |
|
225 | + break; |
|
226 | + } |
|
227 | + case Relation::STARTS_WITH: { |
|
228 | + $param[$paramName] = $value . "%"; |
|
229 | + $result = $field . " like " . $valueparam; |
|
230 | + break; |
|
231 | + } |
|
232 | + case Relation::CONTAINS: { |
|
233 | + $param[$paramName] = "%" . $value . "%"; |
|
234 | + $result = $field . " like " . $valueparam; |
|
235 | + break; |
|
236 | + } |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | return $result; |
@@ -268,38 +268,38 @@ discard block |
||
268 | 268 | |
269 | 269 | foreach ($field as $valueparam) { |
270 | 270 | switch ($relation) { |
271 | - case Relation::EQUAL: { |
|
272 | - $result[$pos] &= ($valueparam == $value); |
|
273 | - break; |
|
274 | - } |
|
275 | - case Relation::GREATER_THAN: { |
|
276 | - $result[$pos] &= ($valueparam > $value); |
|
277 | - break; |
|
278 | - } |
|
279 | - case Relation::LESS_THAN: { |
|
280 | - $result[$pos] &= ($valueparam < $value); |
|
281 | - break; |
|
282 | - } |
|
283 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
284 | - $result[$pos] &= ($valueparam >= $value); |
|
285 | - break; |
|
286 | - } |
|
287 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
288 | - $result[$pos] &= ($valueparam <= $value); |
|
289 | - break; |
|
290 | - } |
|
291 | - case Relation::NOT_EQUAL: { |
|
292 | - $result[$pos] &= ($valueparam != $value); |
|
293 | - break; |
|
294 | - } |
|
295 | - case Relation::STARTS_WITH: { |
|
296 | - $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
297 | - break; |
|
298 | - } |
|
299 | - case Relation::CONTAINS: { |
|
300 | - $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
301 | - break; |
|
302 | - } |
|
271 | + case Relation::EQUAL: { |
|
272 | + $result[$pos] &= ($valueparam == $value); |
|
273 | + break; |
|
274 | + } |
|
275 | + case Relation::GREATER_THAN: { |
|
276 | + $result[$pos] &= ($valueparam > $value); |
|
277 | + break; |
|
278 | + } |
|
279 | + case Relation::LESS_THAN: { |
|
280 | + $result[$pos] &= ($valueparam < $value); |
|
281 | + break; |
|
282 | + } |
|
283 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
284 | + $result[$pos] &= ($valueparam >= $value); |
|
285 | + break; |
|
286 | + } |
|
287 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
288 | + $result[$pos] &= ($valueparam <= $value); |
|
289 | + break; |
|
290 | + } |
|
291 | + case Relation::NOT_EQUAL: { |
|
292 | + $result[$pos] &= ($valueparam != $value); |
|
293 | + break; |
|
294 | + } |
|
295 | + case Relation::STARTS_WITH: { |
|
296 | + $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
297 | + break; |
|
298 | + } |
|
299 | + case Relation::CONTAINS: { |
|
300 | + $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
301 | + break; |
|
302 | + } |
|
303 | 303 | } |
304 | 304 | } |
305 | 305 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | if ($xpathFilter == "") { |
38 | 38 | return "/anydataset/row"; |
39 | 39 | } else { |
40 | - return "/anydataset/row[" . $xpathFilter . "]"; |
|
40 | + return "/anydataset/row[".$xpathFilter."]"; |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
@@ -136,33 +136,33 @@ discard block |
||
136 | 136 | private function getStrXpathRelation($name, $relation, $value) |
137 | 137 | { |
138 | 138 | $str = is_numeric($value) ? "" : "'"; |
139 | - $field = "field[@name='" . $name . "'] "; |
|
139 | + $field = "field[@name='".$name."'] "; |
|
140 | 140 | $value = " $str$value$str "; |
141 | 141 | |
142 | 142 | $result = ""; |
143 | 143 | switch ($relation) { |
144 | 144 | case Relation::EQUAL: { |
145 | - $result = $field . "=" . $value; |
|
145 | + $result = $field."=".$value; |
|
146 | 146 | break; |
147 | 147 | } |
148 | 148 | case Relation::GREATER_THAN: { |
149 | - $result = $field . ">" . $value; |
|
149 | + $result = $field.">".$value; |
|
150 | 150 | break; |
151 | 151 | } |
152 | 152 | case Relation::LESS_THAN: { |
153 | - $result = $field . "<" . $value; |
|
153 | + $result = $field."<".$value; |
|
154 | 154 | break; |
155 | 155 | } |
156 | 156 | case Relation::GREATER_OR_EQUAL_THAN: { |
157 | - $result = $field . ">=" . $value; |
|
157 | + $result = $field.">=".$value; |
|
158 | 158 | break; |
159 | 159 | } |
160 | 160 | case Relation::LESS_OR_EQUAL_THAN: { |
161 | - $result = $field . "<=" . $value; |
|
161 | + $result = $field."<=".$value; |
|
162 | 162 | break; |
163 | 163 | } |
164 | 164 | case Relation::NOT_EQUAL: { |
165 | - $result = $field . "!=" . $value; |
|
165 | + $result = $field."!=".$value; |
|
166 | 166 | break; |
167 | 167 | } |
168 | 168 | case Relation::STARTS_WITH: { |
@@ -191,47 +191,47 @@ discard block |
||
191 | 191 | $paramName = $name; |
192 | 192 | $i = 0; |
193 | 193 | while (array_key_exists($paramName, $param)) { |
194 | - $paramName = $name . ($i++); |
|
194 | + $paramName = $name.($i++); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | $param[$paramName] = $value; |
198 | 198 | |
199 | 199 | $result = ""; |
200 | 200 | $field = " $name "; |
201 | - $valueparam = " [[" . $paramName . "]] "; |
|
201 | + $valueparam = " [[".$paramName."]] "; |
|
202 | 202 | switch ($relation) { |
203 | 203 | case Relation::EQUAL: { |
204 | - $result = $field . "=" . $valueparam; |
|
204 | + $result = $field."=".$valueparam; |
|
205 | 205 | break; |
206 | 206 | } |
207 | 207 | case Relation::GREATER_THAN: { |
208 | - $result = $field . ">" . $valueparam; |
|
208 | + $result = $field.">".$valueparam; |
|
209 | 209 | break; |
210 | 210 | } |
211 | 211 | case Relation::LESS_THAN: { |
212 | - $result = $field . "<" . $valueparam; |
|
212 | + $result = $field."<".$valueparam; |
|
213 | 213 | break; |
214 | 214 | } |
215 | 215 | case Relation::GREATER_OR_EQUAL_THAN: { |
216 | - $result = $field . ">=" . $valueparam; |
|
216 | + $result = $field.">=".$valueparam; |
|
217 | 217 | break; |
218 | 218 | } |
219 | 219 | case Relation::LESS_OR_EQUAL_THAN: { |
220 | - $result = $field . "<=" . $valueparam; |
|
220 | + $result = $field."<=".$valueparam; |
|
221 | 221 | break; |
222 | 222 | } |
223 | 223 | case Relation::NOT_EQUAL: { |
224 | - $result = $field . "!=" . $valueparam; |
|
224 | + $result = $field."!=".$valueparam; |
|
225 | 225 | break; |
226 | 226 | } |
227 | 227 | case Relation::STARTS_WITH: { |
228 | - $param[$paramName] = $value . "%"; |
|
229 | - $result = $field . " like " . $valueparam; |
|
228 | + $param[$paramName] = $value."%"; |
|
229 | + $result = $field." like ".$valueparam; |
|
230 | 230 | break; |
231 | 231 | } |
232 | 232 | case Relation::CONTAINS: { |
233 | - $param[$paramName] = "%" . $value . "%"; |
|
234 | - $result = $field . " like " . $valueparam; |
|
233 | + $param[$paramName] = "%".$value."%"; |
|
234 | + $result = $field." like ".$valueparam; |
|
235 | 235 | break; |
236 | 236 | } |
237 | 237 | } |
@@ -181,14 +181,14 @@ |
||
181 | 181 | $pat = "/$patDriver($patCredentials$patHost$patDatabase|$patFile)$patExtra/i"; |
182 | 182 | $parts = array(); |
183 | 183 | if (!preg_match($pat, $this->getDbConnectionString(), $parts)) { |
184 | - throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it."); |
|
184 | + throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it."); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | // Set the Driver |
188 | 188 | $this->setDriver($parts ['driver']); |
189 | 189 | |
190 | 190 | if (!isset($parts['path']) && !isset($parts['host'])) { |
191 | - throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it."); |
|
191 | + throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it."); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | public function __construct(ConnectionManagement $connMngt) |
12 | 12 | { |
13 | - $strcnn = $connMngt->getDriver() . ":" . $connMngt->getServer(); |
|
13 | + $strcnn = $connMngt->getDriver().":".$connMngt->getServer(); |
|
14 | 14 | |
15 | 15 | parent::__construct($connMngt, $strcnn, [], []); |
16 | 16 | } |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $arg = str_replace("_", SQLBind::keyAdj($key), $paramSubstName); |
48 | 48 | |
49 | 49 | $count = 0; |
50 | - $sql = preg_replace("/(\[\[$key\]\]|:" . $key . "[\s\W]|:$key\$)/", $arg . ' ', $sql, -1, $count); |
|
50 | + $sql = preg_replace("/(\[\[$key\]\]|:".$key."[\s\W]|:$key\$)/", $arg.' ', $sql, -1, $count); |
|
51 | 51 | if ($count === 0) { |
52 | 52 | unset($params[$key]); |
53 | 53 | } |