Skip to content

Commit 32f3e6b

Browse files
committed
fix: editing table data on mysql versions without generated column support
Refs #462
1 parent f79d9a5 commit 32f3e6b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

extra/locale/heidisql.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: HeidiSQL\n"
99
"POT-Creation-Date: 2012-11-05 21:40\n"
10-
"PO-Revision-Date: 2026-03-18 19:40+0100\n"
10+
"PO-Revision-Date: 2026-03-20 10:10+0100\n"
1111
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
1212
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
1313
"Language: en\n"
@@ -4931,8 +4931,8 @@ msgstr "Could not find node to focus."
49314931
msgid "Could not load full row data."
49324932
msgstr "Could not load full row data."
49334933

4934-
msgid "Column %s is defined as generated. You cannot edit its content."
4935-
msgstr "Column %s is defined as generated. You cannot edit its content."
4934+
msgid "Column %s is defined as generated per \"%s\". You cannot edit its content."
4935+
msgstr "Column %s is defined as generated per \"%s\". You cannot edit its content."
49364936

49374937
#: main.pas:8462
49384938
msgid "Not available on %s"

source/const.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ const
9999
MsgUnhandledNetType: String = 'Unhandled connection type (%d)';
100100
MsgUnhandledControl: String = 'Unhandled control in %s';
101101
MsgDisconnect: String = 'Connection to %s closed at %s';
102-
TextInvalidColumn: String = '?';
102+
// This must be an empty string, otherwise TTableColumn's get GenerationExpression=XYZ on old servers
103+
TextInvalidColumn: String = '';
103104
FILEFILTER_SQLITEDB = '*.sqlite3;*.sqlite;*.db;*.s3db';
104105
FILEEXT_SQLITEDB = 'sqlite3';
105106
PROPOSAL_ITEM_HEIGHT = 18;

source/main.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10773,7 +10773,7 @@ procedure TMainForm.AnyGridEditing(Sender: TBaseVirtualTree; Node:
1077310773
if Assigned(ColInfo) then begin
1077410774
Allowed := ColInfo.GenerationExpression.IsEmpty;
1077510775
if not Allowed then
10776-
ErrorDialog(f_('Column %s is defined as generated. You cannot edit its content.', [IntToStr(Column)]));
10776+
ErrorDialog(f_('Column %s is defined as generated per "%s". You cannot edit its content.', [IntToStr(Column), ColInfo.GenerationExpression]));
1077710777
end;
1077810778
end;
1077910779

0 commit comments

Comments
 (0)