Merged revision(s) 43629-43630 #f7c401a66a-#f7c401a66a, 43640 #5926feff6f from trunk:

SqlDb: Remove wrong {$IFDEF VER2_5_1}. Now SQL Parser is enabled again. ........ SqlDb: commit generated .po files. ........ Components, SQLdb: updated Russian translation ........ git-svn-id: branches/fixes_1_2@43655 -
2025-09-11 18:39:05 +02:00 · 2014-01-06 14:29:06 +00:00 · 2014-01-06 14:29:06 +00:00 · f643d06db5
commit f643d06db5
parent 5ca4a81294
11 changed files with 185 additions and 24 deletions
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po
@ -34,10 +34,28 @@ msgstr "Metadata"
 msgid "Tables"
 msgstr "Tabulky"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Výsledky"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "SQL Kód"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.de.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.de.po
@ -33,10 +33,28 @@ msgstr "Metadaten"
 msgid "Tables"
 msgstr "Tabellen"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Ergebnisse"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "SQL-Code"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.es.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.es.po
@ -33,10 +33,28 @@ msgstr "Metadatos"
 msgid "Tables"
 msgstr "Tablas"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Resultados"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "Código SQL"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.it.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.it.po
@ -34,10 +34,28 @@ msgstr ""
 msgid "Tables"
 msgstr ""

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Risultati"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "Codice SQL"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po
@ -1,4 +1,3 @@
- Valdas Jankunas <zmuogs@gmail.com>, 2010, 2012.
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
@ -36,10 +35,28 @@ msgstr "Metaduomenys"
 msgid "Tables"
 msgstr "Lentelės"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Rezultatai"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "SQL kodas"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.po
@ -25,10 +25,28 @@ msgstr ""
 msgid "Tables"
 msgstr ""

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr ""

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr ""
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po
@ -33,10 +33,28 @@ msgstr "Metadata"
 msgid "Tables"
 msgstr "Tabelas"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Resultados"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "Código \"SQL\""
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po
@ -33,10 +33,30 @@ msgstr "Метаданные"
 msgid "Tables"
 msgstr "Таблицы"

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr "Выражение SQL не содержит синтаксических ошибок."
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Результаты"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr "Код SQL некорректен"
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr "Код SQL корректен"
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+"Синтаксическая ошибка в выражении SQL:\n"
+"%s\n"
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "Код SQL"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po
@ -33,10 +33,28 @@ msgstr ""
 msgid "Tables"
 msgstr ""

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "Результати"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "Код SQL"
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po
@ -36,10 +36,28 @@ msgstr ""
 msgid "Tables"
 msgstr ""

+#: sqlstringspropertyeditordlg.sqlsyntaxok
+msgid "No syntax errors in SQL statement."
+msgstr ""
+
 #: sqlstringspropertyeditordlg.sresulttabcaption
 msgid "Results"
 msgstr "返回值"

+#: sqlstringspropertyeditordlg.ssqlerror
+msgid "SQL Error"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlok
+msgid "SQL OK"
+msgstr ""
+
+#: sqlstringspropertyeditordlg.ssqlsyntaxerror
+msgid ""
+"Syntax error in SQL statement:\n"
+"%s\n"
+msgstr ""
+
 #: sqlstringspropertyeditordlg.ssqltabcaption
 msgid "SQL Code"
 msgstr "SQL代码"
--- a/components/sqldb/sqlstringspropertyeditordlg.pas
+++ b/components/sqldb/sqlstringspropertyeditordlg.pas
@ -1,17 +1,13 @@
 unit SQLStringsPropertyEditorDlg;

-{$IFDEF VER2_5_1}
-{$DEFINE HASSQLPARSER}
-{$ENDIF}
-
 {$mode objfpc}{$H+}

 interface

 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, strutils,
  SynEdit, ButtonPanel, SynHighlighterSQL, ComCtrls, SQLDb, db, DBGrids, Menus,
-  SrcEditorIntf,clipbrd, StdCtrls;
+  SrcEditorIntf, clipbrd, StdCtrls, fpsqltree, fpsqlparser;

 type

@ -86,12 +82,6 @@ type

 implementation

-uses
-{$IFDEF HASSQLPARSER}
-  fpsqltree,fpsqlparser,
-{$ENDIF}
-  strutils;
-
 {$R *.lfm}

 resourcestring
@ -104,12 +94,10 @@ resourcestring
  SMetaPleaseSpecifyATableInTheObjectField = 'Please specify a table in the '
    +'object field.';
  SMetaSysTables    = 'SysTables';
-  {$IFDEF HASSQLPARSER}
  SSQLOK            = 'SQL OK';
  SQLSyntaxOK       = 'No syntax errors in SQL statement.';
  SSQLError         = 'SQL Error';
  SSQLSyntaxError   = 'Syntax error in SQL statement:'+slineBreak+'%s';
-  {$ENDIF}

 { TSQLStringsPropertyEditorDlg }

@ -178,13 +166,8 @@ Var
  D : TSQLDialect;

 begin
-  {$IFDEF HASSQLPARSER}
  TBCheck.Visible:=True;
  MICheck.Visible:=True;
-  {$ELSE}
-  TBCheck.Visible:=False;
-  MICheck.Visible:=True;
-  {$ENDIF}
  D:=sqlStandard;
  If Assigned(FConnection) then
    begin
@ -367,16 +350,13 @@ begin
 end;

 procedure TSQLStringsPropertyEditorDlg.CheckSQLSyntax(SQL : TStrings);
-{$IFDEF HASSQLPARSER}
 Var
  S : TStream;
  P : TSQLParser;
  E : TSQLElement;
  EL : TSQLElementList;
  Msg : String;
-{$ENDIF}
 begin
-  {$IFDEF HASSQLPARSER}
  S:=TMemoryStream.Create;
  try
    SQL.SaveToStream(S);
@ -406,7 +386,7 @@ begin
  finally
    S.Free;
  end;
-  {$ENDIF}
 end;
+
 end.