You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mc...@apache.org on 2005/08/04 23:13:44 UTC
cvs commit: xml-xalan/java/samples/extensions/sql/show-error invalidQuery.xsl invalidPQuery.xsl invalidConn.xsl
mcnamara 2005/08/04 14:13:44
Modified: java/samples/extensions/sql/show-error invalidQuery.xsl
invalidPQuery.xsl invalidConn.xsl
Log:
Updates for the SQL samples (part of the fix for XALANJ-2172).
Patch provided by John Gentilin and reviewed by Sarah McNamara.
Revision Changes Path
1.4 +66 -71 xml-xalan/java/samples/extensions/sql/show-error/invalidQuery.xsl
Index: invalidQuery.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/show-error/invalidQuery.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- invalidQuery.xsl 25 Jan 2002 19:41:31 -0000 1.3
+++ invalidQuery.xsl 4 Aug 2005 21:13:44 -0000 1.4
@@ -1,72 +1,67 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:sql="org.apache.xalan.lib.sql.XConnection"
- extension-element-prefixes="sql">
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="driver" select="'com.lutris.instantdb.jdbc.idbDriver'"/>
-
-
-<xsl:param name="datasource" select="'jdbc:idb:../../instantdb/sample.prp'"/>
-
-<!--
-ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
- We will specify a table that does not exist
- in our Database, causing the Query to Fail
-ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
--->
-
-
-<xsl:param name="query" select="'SELECT * FROM TableNotDefined'"/>
-
-<xsl:template match="/">
-
- <xsl:variable name="db" select="sql:new()"/>
-
- <!-- Connect to the database with minimal error detection -->
- <xsl:if test="not(sql:connect($db, $driver, $datasource))" >
- <xsl:message>Error Connecting to the Database</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
- <HTML>
- <HEAD>
- <TITLE>List of products</TITLE>
- </HEAD>
- <BODY>
- <TABLE border="1">
- <xsl:variable name="table" select='sql:query($db, $query)'/>
-
- <!--
- Let's include Error Checking, the error is actually stored
- in the connection since $table will be either data or null
- -->
-
- <xsl:if test="not($table)" >
- <xsl:message>Error in Query</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
- <TR>
- <xsl:for-each select="$table/sql/metadata/column-header">
- <TH><xsl:value-of select="@column-label"/></TH>
- </xsl:for-each>
- </TR>
- <xsl:apply-templates select="$table/sql/row-set/row"/>
- </TABLE>
- </BODY>
- </HTML>
- <xsl:value-of select="sql:close($db)"/>
-</xsl:template>
-
-<xsl:template match="row">
- <TR><xsl:apply-templates select="col"/></TR>
-</xsl:template>
-
-<xsl:template match="col">
- <TD><xsl:value-of select="text()"/></TD>
-</xsl:template>
-
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:sql="org.apache.xalan.lib.sql.XConnection"
+ extension-element-prefixes="sql">
+
+<xsl:output method="html" indent="yes"/>
+
+<xsl:param name="driver" select="'org.apache.derby.jdbc.EmbeddedDriver'"/>
+<xsl:param name="datasource" select="'jdbc:derby:sampleDB'"/>
+
+<!--
+ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
+ We will specify a table that does not exist
+ in our Database, causing the Query to Fail
+ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
+-->
+
+<xsl:param name="query" select="'SELECT * FROM TableNotDefined'"/>
+
+<xsl:template match="/">
+
+ <xsl:variable name="db" select="sql:new()"/>
+
+ <!-- Connect to the database with minimal error detection -->
+ <xsl:if test="not(sql:connect($db, $driver, $datasource))" >
+ <xsl:message>Error Connecting to the Database</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+ <HTML>
+ <HEAD>
+ <TITLE>List of products</TITLE>
+ </HEAD>
+ <BODY>
+ <TABLE border="1">
+ <xsl:variable name="table" select='sql:query($db, $query)'/>
+
+ <!-- Let's include Error Checking, the error is actually stored
+ in the connection since $table will be either data or null -->
+
+ <xsl:if test="not($table)" >
+ <xsl:message>Error in Query</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+ <TR>
+ <xsl:for-each select="$table/sql/metadata/column-header">
+ <TH><xsl:value-of select="@column-label"/></TH>
+ </xsl:for-each>
+ </TR>
+ <xsl:apply-templates select="$table/sql/row-set/row"/>
+ </TABLE>
+ </BODY>
+ </HTML>
+ <xsl:value-of select="sql:close($db)"/>
+</xsl:template>
+
+<xsl:template match="row">
+ <TR><xsl:apply-templates select="col"/></TR>
+</xsl:template>
+
+<xsl:template match="col">
+ <TD><xsl:value-of select="text()"/></TD>
+</xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
1.4 +66 -74 xml-xalan/java/samples/extensions/sql/show-error/invalidPQuery.xsl
Index: invalidPQuery.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/show-error/invalidPQuery.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- invalidPQuery.xsl 25 Jan 2002 19:41:31 -0000 1.3
+++ invalidPQuery.xsl 4 Aug 2005 21:13:44 -0000 1.4
@@ -1,75 +1,67 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:sql="org.apache.xalan.lib.sql.XConnection"
- extension-element-prefixes="sql">
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="driver" select="'com.lutris.instantdb.jdbc.idbDriver'"/>
-
-
-<xsl:param name="datasource" select="'jdbc:idb:../../instantdb/sample.prp'"/>
-
-
-<xsl:param name="query" select="'SELECT * FROM import1 where ProductID = ?'"/>
-
-<xsl:template match="/">
-
- <xsl:variable name="db" select="sql:new()"/>
-
- <!-- Connect to the database with minimal error detection -->
- <xsl:if test="not(sql:connect($db, $driver, $datasource))" >
- <xsl:message>Error Connecting to the Database</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
- <HTML>
- <HEAD>
- <TITLE>List of products</TITLE>
- </HEAD>
- <BODY>
- <TABLE border="1">
-
-<!--
-ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
- We are specifying an extra value where are query only expects one
-ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
--->
-
- <xsl:value-of select="sql:clearParameters()"/>
- <xsl:value-of select="sql:addParameterWithType($db, '1', 'short')"/>
- <xsl:value-of select="sql:addParameterWithType($db, '1', 'short')"/>
- <xsl:variable name="table" select='sql:pquery($db, $query)'/>
-
- <!--
- Let's include Error Checking, the error is actually stored
- in the connection since $table will be either data or null
- -->
-
- <xsl:if test="not($table)" >
- <xsl:message>Error in Query</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
- <TR>
- <xsl:for-each select="$table/sql/metadata/column-header">
- <TH><xsl:value-of select="@column-label"/></TH>
- </xsl:for-each>
- </TR>
- <xsl:apply-templates select="$table/sql/row-set/row"/>
- </TABLE>
- </BODY>
- </HTML>
- <xsl:value-of select="sql:close($db)"/>
-</xsl:template>
-
-<xsl:template match="row">
- <TR><xsl:apply-templates select="col"/></TR>
-</xsl:template>
-
-<xsl:template match="col">
- <TD><xsl:value-of select="text()"/></TD>
-</xsl:template>
-
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:sql="org.apache.xalan.lib.sql.XConnection"
+ extension-element-prefixes="sql">
+
+<xsl:output method="html" indent="yes"/>
+
+<xsl:param name="driver" select="'org.apache.derby.jdbc.EmbeddedDriver'"/>
+<xsl:param name="datasource" select="'jdbc:derby:sampleDB'"/>
+<xsl:param name="query" select="'SELECT * FROM import1 where ProductID = ?'"/>
+
+<xsl:template match="/">
+
+ <xsl:variable name="db" select="sql:new()"/>
+
+ <!-- Connect to the database with minimal error detection -->
+ <xsl:if test="not(sql:connect($db, $driver, $datasource))" >
+ <xsl:message>Error Connecting to the Database</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+ <HTML>
+ <HEAD>
+ <TITLE>List of products</TITLE>
+ </HEAD>
+ <BODY>
+ <TABLE border="1">
+
+<!--
+ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
+ We are executing a query with missing parameters
+ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
+-->
+
+ <xsl:value-of select="sql:clearParameters()"/>
+ <xsl:variable name="table" select='sql:pquery($db, $query)'/>
+
+ <!-- Let's include Error Checking, the error is actually stored
+ in the connection since $table will be either data or null -->
+
+ <xsl:if test="not($table)" >
+ <xsl:message>Error in Query</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+ <TR>
+ <xsl:for-each select="$table/sql/metadata/column-header">
+ <TH><xsl:value-of select="@column-label"/></TH>
+ </xsl:for-each>
+ </TR>
+ <xsl:apply-templates select="$table/sql/row-set/row"/>
+ </TABLE>
+ </BODY>
+ </HTML>
+ <xsl:value-of select="sql:close($db)"/>
+</xsl:template>
+
+<xsl:template match="row">
+ <TR><xsl:apply-templates select="col"/></TR>
+</xsl:template>
+
+<xsl:template match="col">
+ <TD><xsl:value-of select="text()"/></TD>
+</xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
1.4 +57 -1 xml-xalan/java/samples/extensions/sql/show-error/invalidConn.xsl
Index: invalidConn.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/show-error/invalidConn.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- invalidConn.xsl 25 Jan 2002 19:41:31 -0000 1.3
+++ invalidConn.xsl 4 Aug 2005 21:13:44 -0000 1.4
@@ -1 +1,57 @@
-<?xml version="1.0"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:sql="org.apache.xalan.lib.sql.XConnection" extension-element-prefixes="sql"><xsl:output method="html" indent="yes"/><xsl:param name="driver" select="'com.lutris.instantdb.jdbc.idbDriver'"/><!-- ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR We are specifying a database that does not exist, which will cause a connection errorERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR--><xsl:param name="datasource" select="'jdbc:idb:../../instantdb/DoesNotExist.prp'"/><xsl:param name="query" select="'SELECT * FROM import2'"/><xsl:template match="/"> <xsl:variable name="db" select="sql:new()"/> <!-- Connect to the database with minimal error detection --> <xsl:if test="not(sql:connect($db, $driver, $datasource))" > <xsl:message>Error Connecting to the Database</xsl:message> <xsl:copy-of select="sql:getError($db)/ext-error" /> </xsl:if> <HTML> <HEAD> <TITLE>List of products</TITLE> </HEAD> <BODY> <TABLE border="1"> <xsl:variable name="table" select='sql:query($db, $query)'/> <!-- Let's include Error Checking, the error is actually stored in the connection since $table will be either data or null --> <xsl:if test="not($table)" > <xsl:message>Error in Query</xsl:message> <xsl:copy-of select="sql:getError($db)/ext-error" /> </xsl:if> <TR> <xsl:for-each select="$table/row-set/column-header"> <TH><xsl:value-of select="@column-label"/></TH> </xsl:for-each> </TR> <xsl:apply-templates select="$table/row-set/row"/> </TABLE> </BODY> </HTML> <xsl:value-of select="sql:close($db)"/></xsl:template><xsl:template match="row"> <TR><xsl:apply-templates select="col"/></TR></xsl:template><xsl:template match="col"> <TD><xsl:value-of select="text()"/></TD></xsl:template></xsl:stylesheet>
\ No newline at end of file
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:sql="org.apache.xalan.lib.sql.XConnection" extension-element-prefixes="sql">
+ <xsl:output method="html" indent="yes"/>
+ <!-- ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR
+ We are specifying a database that does not exist,
+ which will cause a connection error
+ ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR -->
+ <xsl:param name="driver" select="'org.apache.derby.jdbc.EmbeddedDriver'"/>
+
+ <xsl:param name="datasource" select="'jdbc:derby:DoesNotExistDB'"/>
+
+ <xsl:param name="query" select="'SELECT * FROM import1'"/>
+
+ <xsl:template match="/">
+ <xsl:variable name="db" select="sql:new()"/>
+ <!-- Connect to the database with minimal error detection -->
+ <xsl:if test="not(sql:connect($db, $driver, $datasource))" >
+ <xsl:message>Error Connecting to the Database</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+ <HTML>
+ <HEAD>
+ <TITLE>List of products</TITLE>
+ </HEAD>
+ <BODY>
+ <TABLE border="1">
+ <xsl:variable name="table" select='sql:query($db, $query)'/>
+ <!-- Let's include Error Checking, the error is actually stored
+ in the connection since $table will be either data or null -->
+ <xsl:if test="not($table)" >
+ <xsl:message>Error in Query</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+ <TR>
+ <xsl:for-each select="$table/row-set/column-header">
+ <TH>
+ <xsl:value-of select="@column-label"/>
+ </TH>
+ </xsl:for-each>
+ </TR>
+ <xsl:apply-templates select="$table/row-set/row"/>
+ </TABLE>
+ </BODY>
+ </HTML>
+ <xsl:value-of select="sql:close($db)"/>
+ </xsl:template>
+ <xsl:template match="row">
+ <TR>
+ <xsl:apply-templates select="col"/>
+ </TR>
+ </xsl:template>
+ <xsl:template match="col">
+ <TD>
+ <xsl:value-of select="text()"/>
+ </TD>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org