From 575a082272b6cfdfac7673b6ab9c124db8381297 Mon Sep 17 00:00:00 2001 From: reiniero Date: Tue, 10 Jun 2014 05:51:51 +0000 Subject: [PATCH] * fcl-db: fix set terminator tests when run within suite/all tests instead of single test git-svn-id: trunk@27916 - --- packages/fcl-db/tests/tcparser.pas | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/fcl-db/tests/tcparser.pas b/packages/fcl-db/tests/tcparser.pas index e5dbfa6ee7..8a4aa536da 100644 --- a/packages/fcl-db/tests/tcparser.pas +++ b/packages/fcl-db/tests/tcparser.pas @@ -27,7 +27,7 @@ type TTestParser = Class(TSQLParser) public - procedure ParseStringDef(Out DT : TSQLDataType; Out Len : Integer; Out ACharset : TSQLStringtype); + Procedure ParseStringDef(Out DT : TSQLDataType; Out Len : Integer; Out ACharset : TSQLStringtype); Function ParseType(Flags : TParseTypeFlags) : TSQLTypeDefinition; Function ParseConstraint : TSQLExpression; Function ParseProcedureStatements : TSQLStatement; @@ -922,22 +922,22 @@ procedure TTestTermParser.TestSetTermCreateProcedureVar; // Procedure with variable Const SQL = - 'SET TERM ^ ;'+#13+#10+ - 'CREATE PROCEDURE PROCWITHVAR'+#13+#10+ - 'RETURNS (LANGUAGES VARCHAR(15) CHARACTER SET NONE)'+#13+#10+ - 'AS'+#13+#10+ - 'DECLARE VARIABLE i INTEGER;'+#13+#10+ - 'BEGIN'+#13+#10+ - ' i = 1;'+#13+#10+ - ' WHILE (i <= 5) DO'+#13+#10+ - ' BEGIN'+#13+#10+ - ' SELECT language_req[:i] FROM job'+#13+#10+ - ' INTO :languages;'+#13+#10+ - ' i = i +1;'+#13+#10+ - ' SUSPEND;'+#13+#10+ - ' END'+#13+#10+ - 'END ^'+#13+#10+ - 'SET TERM ; ^'; + 'SET TERM ^ ;'+#13+#10+ + 'CREATE PROCEDURE PROCWITHVAR'+#13+#10+ + 'RETURNS (LANGUAGES VARCHAR(15) CHARACTER SET NONE)'+#13+#10+ + 'AS'+#13+#10+ + 'DECLARE VARIABLE i INTEGER;'+#13+#10+ + 'BEGIN'+#13+#10+ + ' i = 1;'+#13+#10+ + ' WHILE (i <= 5) DO'+#13+#10+ + ' BEGIN'+#13+#10+ + ' SELECT language_req[:i] FROM job'+#13+#10+ + ' INTO :languages;'+#13+#10+ + ' i = i +1;'+#13+#10+ + ' SUSPEND;'+#13+#10+ + ' END'+#13+#10+ + 'END ^'+#13+#10+ + 'SET TERM ; ^'; Var S : TSQLSetTermStatement; @@ -987,7 +987,7 @@ end; procedure TTestSQLParser.SetUp; begin - + FParser.SetStatementTerminator(';'); end; procedure TTestSQLParser.TearDown;