From ac08c20b7117928aa31f304648205eebeb51f089 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 1 Nov 2007 14:20:58 +0000 Subject: [PATCH] INTEGRATION: CWS dba24b (1.7.172); FILE MERGED 2007/08/22 11:41:58 oj 1.7.172.1: #i76374# handle cross join as natural join now in query design --- dbaccess/source/ui/inc/dbu_qry.hrc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index bd4648bc1c31..b71823c26997 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -4,9 +4,9 @@ * * $RCSfile: dbu_qry.hrc,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-07-10 15:30:45 $ + * last change: $Author: hr $ $Date: 2007-11-01 15:20:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,10 +89,12 @@ #define STR_ERROR_PARSING_STATEMENT RID_STR_QRY_START + 46 #define STR_INFO_OPENING_IN_SQL_VIEW RID_STR_QRY_START + 47 #define STR_STATEMENT_WITHOUT_RESULT_SET RID_STR_QRY_START + 48 +#define STR_QUERY_CROSS_JOIN RID_STR_QRY_START + 49 +#define STR_QUERY_NATURAL_JOIN RID_STR_QRY_START + 50 // please adjust checking when inserting new strings -#if STR_STATEMENT_WITHOUT_RESULT_SET > RID_STR_QRY_END +#if STR_QUERY_NATURAL_JOIN > RID_STR_QRY_END #error resource id overflow in #file, #line #endif