Update of /cvsroot/monetdb/pathfinder/compiler/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23474/sql
Modified Files:
Tag: XQuery_0-22
lalg2sql.brg sql.c
Log Message:
Renaming the namespace column to uri.
I think this is an appropriate name, since
we store uris in our database
Index: sql.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/sql/sql.c,v
retrieving revision 1.48
retrieving revision 1.48.4.1
diff -u -d -r1.48 -r1.48.4.1
--- sql.c 21 Jan 2008 14:30:50 -0000 1.48
+++ sql.c 8 Feb 2008 13:03:57 -0000 1.48.4.1
@@ -1306,7 +1306,7 @@
case sql_col_nameid: return "nameid";
case sql_col_value: return "value";
case sql_col_name: return "name";
- case sql_col_namespace: return "namespace";
+ case sql_col_ns_uri: return "uri";
case sql_col_twig_pre: return "twig_pre";
case sql_col_iter: return "iter";
case sql_col_pos: return "pos";
Index: lalg2sql.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/sql/lalg2sql.brg,v
retrieving revision 1.108.4.1
retrieving revision 1.108.4.2
diff -u -d -r1.108.4.1 -r1.108.4.2
--- lalg2sql.brg 7 Feb 2008 17:10:00 -0000 1.108.4.1
+++ lalg2sql.brg 8 Feb 2008 13:03:56 -0000 1.108.4.2
@@ -475,6 +475,7 @@
#define LEVEL_ column_name (special_col (sql_col_level))
#define KIND_ column_name (special_col (sql_col_kind))
#define NAME_ column_name (special_col (sql_col_name))
+#define NS_URI_ column_name (special_col (sql_col_ns_uri))
#define GUIDE_ column_name (special_col (sql_col_guide))
#define VALUE_ column_name (special_col (sql_col_value))
#define TWIG_PRE_ column_name (special_col (sql_col_twig_pre))
@@ -488,7 +489,7 @@
#define LEVEL(n) ext_column_name (n, special_col (sql_col_level))
#define KIND(n) ext_column_name (n, special_col (sql_col_kind))
#define NAME(n) ext_column_name (n, special_col (sql_col_name))
-#define NAMESPACE(n) ext_column_name (n, special_col (sql_col_namespace))
+#define NS_URI(n) ext_column_name (n, special_col (sql_col_ns_uri))
#define GUIDE(n) ext_column_name (n, special_col (sql_col_guide))
#define VALUE(n) ext_column_name (n, special_col (sql_col_value))
#define TWIG_PRE(n) ext_column_name (n, special_col (sql_col_twig_pre))
@@ -1301,7 +1302,7 @@
if (name)
where_list_add (WHERELIST(p), eq (NAME(step), name));
if (namespace)
- where_list_add (WHERELIST(p), eq (NAMESPACE(step), namespace));
+ where_list_add (WHERELIST(p), eq (NS_URI(step), namespace));
}
static void
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
