Skip to content

Commit cbdcdb1

Browse files
author
Radovan Janjic
committed
bug fix
1 parent 0aec938 commit cbdcdb1

File tree

7 files changed

+26
-54
lines changed

7 files changed

+26
-54
lines changed

‎MySQL_wrapper.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ function importUpdateCSV2Table($file, $table, $delimiter = ',', $enclosure = '"'
432432
// Remove auto_increment if exists
433433
$change = array();
434434
$this->query("SHOW COLUMNS FROM `{$tmp_name}` WHERE `Key` NOT LIKE '';");
435-
if($this->affected){
435+
if ($this->affected > 0) {
436436
while ($row = $this->fetchArray()) {
437437
$change[$row['Field']] = "CHANGE `{$row['Field']}` `{$row['Field']}` {$row['Type']}";
438438
}
@@ -482,7 +482,7 @@ function importUpdateCSV2Table($file, $table, $delimiter = ',', $enclosure = '"'
482482
// Drop tmp table
483483
$this->query("DROP TEMPORARY TABLE `{$tmp_name}`;");
484484

485-
return ($i) ? $i : FALSE;
485+
return ($i > 0) ? $i / 2 : $i;
486486
}
487487

488488
/** Export table data to CSV file.

‎log-mysql.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@
1515
2014-01-14 11:08:43 - ERROR -> NO -> 1064 - DESC -> You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!@#$' at line 1 - CALL -> Function query in C:\xampp\htdocs\Git\PHP_MySQL_wrapper\example.php on line 442
1616
2014-01-14 11:12:48 - QUERY -> EXEC -> 0.00573015 -> SHOW COLUMNS FROM `table`;
1717
2014-01-14 11:12:48 - ERROR -> NO -> 1064 - DESC -> You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!@#$' at line 1 - CALL -> Function query in C:\xampp\htdocs\Git\PHP_MySQL_wrapper\example.php on line 441
18+
2014-01-14 17:14:14 - QUERY -> EXEC -> 0.00538516 -> SHOW COLUMNS FROM `table`;
19+
2014-01-14 17:14:14 - ERROR -> NO -> 1064 - DESC -> You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!@#$' at line 1 - CALL -> Function query in C:\xampp\htdocs\Git\PHP_MySQL_wrapper\example.php on line 469

‎test_files/test-1.txt‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
1-
"id","firstname","surname","email","date","l","time","booking_number","departing"
2-
"1","foo","bar","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:38:41","","0000-00-00"
3-
"2","Radovana","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:38:41","","0000-00-00"
4-
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
5-
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
6-
"5","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
7-
"6","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
8-
"7","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
9-
"8","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
10-
"9","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
11-
"10","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
12-
"12","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:38:39","","0000-00-00"
13-
"13","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:38:39","","0000-00-00"
14-
"15","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:56:31","","0000-00-00"
15-
"16","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:56:31","","0000-00-00"
16-
"18","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:01:49","","0000-00-00"
17-
"19","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:01:49","","0000-00-00"
18-
"21","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:07:32","","0000-00-00"
19-
"22","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:07:32","","0000-00-00"
20-
"24","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:08:35","","0000-00-00"
21-
"25","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:08:35","","0000-00-00"
22-
"27","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:12:40","","0000-00-00"
23-
"28","Radovan","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 11:12:40","","0000-00-00"
1+
"id","firstname","surname","email","date"
2+
"1","foo","bar","rade@it-radionica.com","2014-01-14"
3+
"2","Radovana","Janjic","rade@it-radionica.com","2014-01-14"
4+
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04"
5+
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
6+
"5","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
7+
"6","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
8+
"7","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
9+
"8","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
10+
"9","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
11+
"10","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
12+
"12","Radovan","Janjic","rade@it-radionica.com","2014-01-14"
13+
"13","Radovan","Janjic","rade@it-radionica.com","2014-01-14"

‎test_files/test-2.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,3 @@
1111
"Radovan","Janjic"
1212
"Radovan","Janjic"
1313
"Radovan","Janjic"
14-
"Radovan","Janjic"
15-
"Radovan","Janjic"
16-
"Radovan","Janjic"
17-
"Radovan","Janjic"
18-
"Radovan","Janjic"
19-
"Radovan","Janjic"
20-
"Radovan","Janjic"
21-
"Radovan","Janjic"
22-
"Radovan","Janjic"
23-
"Radovan","Janjic"

‎test_files/test-3.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,3 @@
1111
"Radovan","Janjic","2012-11-04"
1212
"Radovan","Janjic","2014-01-14"
1313
"Radovan","Janjic","2014-01-14"
14-
"Radovan","Janjic","2014-01-14"
15-
"Radovan","Janjic","2014-01-14"
16-
"Radovan","Janjic","2014-01-14"
17-
"Radovan","Janjic","2014-01-14"
18-
"Radovan","Janjic","2014-01-14"
19-
"Radovan","Janjic","2014-01-14"
20-
"Radovan","Janjic","2014-01-14"
21-
"Radovan","Janjic","2014-01-14"
22-
"Radovan","Janjic","2014-01-14"
23-
"Radovan","Janjic","2014-01-14"

‎test_files/test-4.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"id","firstname","surname","email","date","l","time","booking_number","departing"
2-
"2","Radovana","Janjic","rade@it-radionica.com","2014-01-14","0","2014-01-14 10:38:41","","0000-00-00"
3-
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
4-
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
5-
"5","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
6-
"6","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
1+
"id","firstname","surname","email","date"
2+
"2","Radovana","Janjic","rade@it-radionica.com","2014-01-14"
3+
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04"
4+
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
5+
"5","Radovan","Janjic","rade@it-radionica.com","2012-11-04"
6+
"6","Radovan","Janjic","rade@it-radionica.com","2012-11-04"

‎test_files/test-query2csv.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
"id","firstname","surname","email","date","l","time","booking_number","departing"
2-
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
3-
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04","0","2014-01-14 10:38:30","","0000-00-00"
1+
"id","firstname","surname","email","date"
2+
"3","Radovan","Janjic'","rade@it-radionica.com","2012-11-04"
3+
"4","Radovan","Janjic","rade@it-radionica.com","2012-11-04"

0 commit comments

Comments
 (0)