Changeset: 86d353e114bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86d353e114bf
Modified Files:
MonetDB5/configure.ag
sql/src/server/sql_parser.mx
Branch: sciql
Log Message:
Include the changes
diffs (truncated from 629 to 300 lines):
diff -r ed85a9c7f949 -r 86d353e114bf MonetDB5/configure.ag
--- a/MonetDB5/configure.ag Fri Nov 05 12:49:50 2010 +0100
+++ b/MonetDB5/configure.ag Mon Nov 22 23:38:49 2010 +0100
@@ -90,7 +90,7 @@
AM_MONETDB_UTILS()
AM_MONETDB_TYPES()
AM_MONETDB_PATH_FILE()
-dnl AM_MONETDB_TOOLS()
+AM_MONETDB_TOOLS()
dnl AM_MONETDB_LIBS()
AM_MONETDB_LIB_PTHREAD()
AM_MONETDB_LIB_M()
@@ -203,7 +203,7 @@
;;
*)
SPHINXCLIENT_CFLAGS="-I$have_sphinxclient/include"
- SPHINXCLIENT_LIBS="-L$have_sphinxclient/lib -lsphinxclient"
+ SPHINXCLIENT_LIBS="-L$have_sphinxclient/lib"
;;
esac
@@ -214,7 +214,8 @@
AC_CHECK_HEADER(sphinxclient.h,
AC_CHECK_LIB(sphinxclient, sphinx_create,
AC_DEFINE(HAVE_SPHINXCLIENT, 1, [Define if you have the
sphinxclient library])
- have_sphinxclient=yes,
+ have_sphinxclient=yes
+ SPHINXCLIENT_LIBS="SPHINXCLIENT_LIBS -lsphinxclient",
[ if test "x$have_sphinxclient" != xauto; then
AC_MSG_ERROR([-lsphinxclient library not found]); fi; have_sphinxclient=no ]),
[ if test "x$have_sphinxclient" != xauto; then
AC_MSG_ERROR([sphinxclient.h header not found]); fi; have_sphinxclient=no ])
LDFLAGS="$save_LDFLAGS"
diff -r ed85a9c7f949 -r 86d353e114bf sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Fri Nov 05 12:49:50 2010 +0100
+++ b/sql/src/server/sql_parser.mx Mon Nov 22 23:38:49 2010 +0100
@@ -1,203 +1,22 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2010 MonetDB B.V.
-All Rights Reserved.
-@
-
-...@f sql_parser
-...@a N.J. Nes
-...@*
-
-...@h
-#ifndef _SQL_PARSER_H_
-#define _SQL_PARSER_H_
-
-#include "sql_statement.h"
-
-/* the next define makes the parser output more specific error messages,
- * instead of only a dull 'parse error' */
-#define YYERROR_VERBOSE 1
-/* enable this to get an idea of what the parser is doing on stdout
-#define YYDEBUG 1
-*/
-
-typedef enum tokens {
- SQL_CREATE_SCHEMA,
- SQL_CREATE_TABLE,
- SQL_CREATE_VIEW,
- SQL_CREATE_INDEX,
- SQL_CREATE_ROLE,
- SQL_CREATE_USER,
- SQL_CREATE_TYPE,
- SQL_CREATE_PROC,
- SQL_CREATE_FUNC,
- SQL_CREATE_AGGR,
- SQL_CREATE_SEQ,
- SQL_CREATE_TRIGGER,
- SQL_DROP_SCHEMA,
- SQL_DROP_TABLE,
- SQL_DROP_VIEW,
- SQL_DROP_INDEX,
- SQL_DROP_ROLE,
- SQL_DROP_USER,
- SQL_DROP_TYPE,
- SQL_DROP_FUNC,
- SQL_DROP_PROC,
- SQL_DROP_SEQ,
- SQL_DROP_TRIGGER,
- SQL_ALTER_TABLE,
- SQL_ALTER_SEQ,
- SQL_ALTER_USER,
- SQL_RENAME_USER,
- SQL_DROP_COLUMN,
- SQL_DROP_CONSTRAINT,
- SQL_DROP_DEFAULT,
- SQL_DECLARE,
- SQL_SET,
- SQL_CALL,
- SQL_PREP,
- SQL_NAME,
- SQL_USER,
- SQL_PATH,
- SQL_CHARSET,
- SQL_SCHEMA,
- SQL_TABLE,
- SQL_TABLE_OPERATOR,
- SQL_TYPE,
- SQL_CASE,
- SQL_CAST,
- SQL_RETURN,
- SQL_IF,
- SQL_ELSE,
- SQL_WHILE,
- SQL_COLUMN,
- SQL_COLUMN_OPTIONS,
- SQL_COALESCE,
- SQL_CONSTRAINT,
- SQL_CHECK,
- SQL_DEFAULT,
- SQL_NOT_NULL,
- SQL_NULL,
- SQL_IS_NULL,
- SQL_IS_NOT_NULL,
- SQL_NULLIF,
- SQL_UNIQUE,
- SQL_PRIMARY_KEY,
- SQL_FOREIGN_KEY,
- SQL_BEGIN,
- TR_COMMIT,
- TR_ROLLBACK,
- TR_SAVEPOINT,
- TR_RELEASE,
- TR_START,
- TR_MODE,
- SQL_INSERT,
- SQL_DELETE,
- SQL_UPDATE,
- SQL_CROSS,
- SQL_JOIN,
- SQL_SELECT,
- SQL_CONNECT,
- SQL_DISCONNECT,
- SQL_DATABASE,
- SQL_PORT,
- SQL_WHERE,
- SQL_FROM,
- SQL_UNIONJOIN,
- SQL_UNION,
- SQL_EXCEPT,
- SQL_INTERSECT,
- SQL_VALUES,
- SQL_ASSIGN,
- SQL_ORDERBY,
- SQL_GROUPBY,
- SQL_DESC,
- SQL_AND,
- SQL_OR,
- SQL_NOT,
- SQL_EXISTS,
- SQL_NOT_EXISTS,
- SQL_OP,
- SQL_UNOP,
- SQL_BINOP,
- SQL_NOP,
- SQL_BETWEEN,
- SQL_NOT_BETWEEN,
- SQL_LIKE,
- SQL_NOT_LIKE,
- SQL_IN,
- SQL_NOT_IN,
- SQL_GRANT,
- SQL_GRANT_ROLES,
- SQL_REVOKE,
- SQL_REVOKE_ROLES,
- SQL_EXECUTE,
- SQL_PRIVILEGES,
- SQL_ROLE,
- SQL_PW_UNENCRYPTED,
- SQL_PW_ENCRYPTED,
- SQL_PARAMETER,
- SQL_FUNC,
- SQL_AGGR,
- SQL_RANK,
- SQL_COMPARE,
- SQL_TEMP_LOCAL,
- SQL_TEMP_GLOBAL,
- SQL_INT_VALUE,
- SQL_ATOM,
- SQL_USING,
- SQL_WHEN,
- SQL_ESCAPE,
- SQL_COPYFROM,
- SQL_BINCOPYFROM,
- SQL_COPYTO,
- SQL_EXPORT,
- SQL_NEXT,
- SQL_MULSTMT,
- SQL_WITH,
- SQL_XMLCOMMENT,
- SQL_XMLCONCAT,
- SQL_XMLDOCUMENT,
- SQL_XMLELEMENT,
- SQL_XMLATTRIBUTE,
- SQL_XMLFOREST,
- SQL_XMLPARSE,
- SQL_XMLPI,
- SQL_XMLQUERY,
- SQL_XMLTEXT,
- SQL_XMLVALIDATE,
- SQL_XMLNAMESPACES
-} tokens;
-
-typedef enum jt {
- jt_inner = 0,
- jt_left = 1,
- jt_right = 2,
- jt_full = 3,
- jt_union = 4
-} jt;
-
-extern char *token2string(int token);
-extern void *sql_error(mvc *sql, int error_code, char *format, ...);
-extern int parse_error(mvc *sql, char *s);
-extern int sqlparse(void *);
-
-#endif /*_SQL_PARSER_H_*/
-
-...@y
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2010 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
%{
#include "sql_config.h"
#include <sql_mem.h>
@@ -442,6 +261,10 @@
XML_primary
opt_comma_string_value_expression
+ group_item
+ dimension
+ array_element
+
%type <type>
data_type
datetime_type
@@ -490,6 +313,7 @@
ident_commalist
opt_corresponding
column_ref_commalist
+ group_ref_commalist
name_commalist
schema_name_list
column_ref
@@ -557,6 +381,12 @@
forest_element_list
forest_element
XML_value_expression_list
+ dim_range
+ dim_range_list
+ dim_exp
+ index_exp
+ index_exp_list
+ index_term
%type <i_val>
any_all_some
@@ -602,6 +432,7 @@
with_or_without_data
XML_content_option
XML_whitespace_option
+ table_or_array
%type <w_val>
wrdval
@@ -682,11 +513,13 @@
%token NIL REF ABSENT EMPTY DOCUMENT ELEMENT CONTENT XMLNAMESPACES NAMESPACE
%token XMLVALIDATE RETURNING LOCATION ID ACCORDING XMLSCHEMA URI XMLAGG
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
