--- sql2xls.cgi	2008/11/06 10:37:17	22
+++ sql2xls.cgi	2012/12/27 12:57:01	28
@@ -99,7 +99,7 @@
 
 require_config;
 
-warn "# reading SQL queries from $sql_dir\n" if $debug;
+warn "SQL queries from $sql_dir\n";
 
 opendir(DIR, $sql_dir) || die "can't opendir $sql_dir: $!";
 my @sql_files = sort grep { /\.sql$/i && -f "$sql_dir/$_" } readdir(DIR);
@@ -124,7 +124,15 @@
 	my $database = shift || return;
 	print STDERR "## connect to $database\n" if $debug;
 	$dbh = DBI->connect($dsn . $database,$user,$passwd, { RaiseError => 1, AutoCommit => 0 }) || die $DBI::errstr;
-	$dbh->do( qq{ set names '$db_encoding'; } ) if $db_encoding && $dsn =~ m{mysql};
+	if ( $db_encoding ) {
+		if ( $dsn =~ m{Pg} ) {
+			$dbh->do( qq{ set client_encoding = '$db_encoding'; } );
+		} elsif ( $dsn =~ m{mysql} ) {
+			$dbh->do( qq{ set names '$db_encoding'; } );
+		} else {
+			warn "Don't know how to set encoding to $db_encoding for $dsn";
+		}
+	}
 }
 
 use_database( $database );
@@ -187,12 +195,12 @@
 
 	foreach my $sql ( split(/;/, $full_sql ) ) {
 
-		warn "SQL: $sql\n" if $debug;
+		warn "SQL: $sql\n";
 
 		my $sth = $dbh->prepare($sql);
 		$sth->execute();
 
-		next unless $sth->{NAME}; # $sth->rows doesn't work for insert into with MySQL
+		next unless $sth->{NAME} && $sth->rows > 0; # $sth->rows alone doesn't work for insert into with MySQL
 
 		my @types = eval {
 			map { $dbh->type_info($_) ? $dbh->type_info($_)->{TYPE_NAME} : '?' } @{ $sth->{TYPE} };
@@ -216,6 +224,7 @@
 					warn "## heuristic date time: $1T$2\n" if $debug;
 					$worksheet->write_date_time( $row, $col, "$1T$2", $date_format );
 				} else {
+					$data = "'" . $data if $data =~ m/^=/; # escape data which looks like formula
 					$worksheet->write($row, $col, _c( $data ) );
 				}
 			}