Completed
Push — release-2.1 ( be8188...284426 )
by Michael
07:12
created
Sources/Subs-Db-postgresql.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -197,22 +197,22 @@  discard block
 block discarded – undo
197 197
 
198 198
 		case 'date':
199 199
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
200
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
200
+				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
201 201
 			else
202 202
 				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
203 203
 		break;
204 204
 
205 205
 		case 'time':
206 206
 			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
207
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
207
+				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
208 208
 			else
209 209
 				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
210 210
 		break;
211 211
 		
212 212
 		case 'datetime':
213 213
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
214
-				return 'to_timestamp('.
215
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
214
+				return 'to_timestamp(' .
215
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
216 216
 					',\'YYYY-MM-DD HH24:MI:SS\')';
217 217
 			else
218 218
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -764,10 +764,10 @@  discard block
 block discarded – undo
764 764
 	$returning = '';
765 765
 	$with_returning = false;
766 766
 	// lets build the returning string, mysql allow only in normal mode
767
-	if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
767
+	if (!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
768 768
 	{
769 769
 		// we only take the first key
770
-		$returning = ' RETURNING '.$keys[0];
770
+		$returning = ' RETURNING ' . $keys[0];
771 771
 		$with_returning = true;
772 772
 	}
773 773
 
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
799 799
 			VALUES
800 800
 				' . implode(',
801
-				', $insertRows).$replace.$returning,
801
+				', $insertRows) . $replace . $returning,
802 802
 			array(
803 803
 				'security_override' => true,
804 804
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
 			if ($returnmode === 2)
812 812
 				$return_var = array();
813 813
 
814
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
814
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
815 815
 			{
816 816
 				if (is_numeric($row[0])) // try to emulate mysql limitation
817 817
 				{
Please login to merge, or discard this patch.