opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 22:00:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Safety fixes:

Browse Source 
- Only generate COLLATE in CREATE DATABASE if CHARACTER SET was not empty.
- Surround CHARACTER SET + COLLATE in version conditional comment.
This commit is contained in:
Ansgar Becker
2007-09-18 22:19:01 +00:00
parent 917ede28d7
commit 5d00783b02
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/createdatabase.pas
View File

@ -191,9 +191,12 @@ begin
begin
sql := 'CREATE DATABASE ' + Mainform.Childwin.mask( editDBName.Text );
if comboCharset.Enabled and (comboCharset.Text <> '') then
sql := sql + ' CHARACTER SET ' + comboCharset.Text;
if comboCollation.Enabled and (comboCollation.Text <> '') then
sql := sql + ' COLLATE ' + comboCollation.Text;
begin
sql := sql + ' /*!40100 CHARACTER SET ' + comboCharset.Text;
if comboCollation.Enabled and (comboCollation.Text <> '') then
sql := sql + ' COLLATE ' + comboCollation.Text;
sql := sql + ' */';
end;
Try
Mainform.Childwin.ExecUpdateQuery( sql );
// Close form
@ -207,9 +210,11 @@ begin
else begin
sql := 'ALTER DATABASE ' + Mainform.Childwin.mask( modifyDB );
if comboCharset.Enabled and (comboCharset.Text <> '') then
begin
sql := sql + ' CHARACTER SET ' + comboCharset.Text;
if comboCollation.Enabled and (comboCollation.Text <> '') then
sql := sql + ' COLLATE ' + comboCollation.Text;
if comboCollation.Enabled and (comboCollation.Text <> '') then
sql := sql + ' COLLATE ' + comboCollation.Text;
end;
Try
Mainform.Childwin.ExecUpdateQuery( sql );
if modifyDB <> editDBName.Text then