hammant 01/11/09 05:16:48
Modified: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateView.java BasicSelect.java
apps/db/src/java/org/apache/avalon/db/basic/parser
BasicLXSQLParser.java
Log:
SelectAction takes Element instead of Document now
Revision Changes Path
1.4 +15 -11
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java
Index: BasicCreateView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicCreateView.java 2001/11/09 12:43:48 1.3
+++ BasicCreateView.java 2001/11/09 13:16:48 1.4
@@ -29,12 +29,12 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class BasicCreateView extends BasicCreateRowHolder implements
CreateTable {
private String mViewName;
- private BasicSelect basicSelect;
+ private BasicSelect mBasicSelect;
private Document mLxsql;
/**
@@ -48,6 +48,14 @@
public BasicCreateView(String viewName, Document lxsql) {
mViewName = viewName;
mLxsql = lxsql;
+
+ NodeList subRootNodes = mLxsql.getChildNodes();
+ for (int i = 0; i < subRootNodes.getLength(); i++) {
+ if (subRootNodes.item(i).getNodeName().equals("select-simple")) {
+ mBasicSelect = new BasicSelect((Element)
subRootNodes.item(i));
+ }
+ }
+
}
@@ -63,23 +71,19 @@
NodeList subRootNodes = mLxsql.getChildNodes();
Column[] columns = null;
- BasicSelect basicSelect = null;
for (int i = 0; i < subRootNodes.getLength(); i++) {
if (subRootNodes.item(i).getNodeName().equals("create-table")) {
columns = getColumns((Element) subRootNodes.item(i));
- } else if
(subRootNodes.item(i).getNodeName().equals("select-simple")) {
- //basicSelect = new BasicSelect(tableName, (Element)
subRootNodes.item(i));
- // TODO
}
}
- View view = new BasicView(mViewName, columns, basicSelect);
+ View view = new BasicView(mViewName, columns, mBasicSelect);
mDatabasePersistor.addView(mViewName, view);
- if (basicSelect != null) {
- basicSelect.execute();
+ if (mBasicSelect != null) {
+ mBasicSelect.execute();
}
@@ -87,8 +91,8 @@
public void setDatabasePersistor(DatabasePersistor databasePersistor) {
super.setDatabasePersistor(databasePersistor);
- if (basicSelect != null) {
- basicSelect.setDatabasePersistor(databasePersistor);
+ if (mBasicSelect != null) {
+ mBasicSelect.setDatabasePersistor(databasePersistor);
}
}
1.4 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicSelect.java
Index: BasicSelect.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicSelect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicSelect.java 2001/11/09 10:22:08 1.3
+++ BasicSelect.java 2001/11/09 13:16:48 1.4
@@ -31,7 +31,7 @@
*/
public class BasicSelect extends AbstractAction implements
Select,ParameterAdaptable {
- private Document mDocument;
+ private Element mRootElement;
private boolean mPrepared;
private boolean mWithParams;
private int mParamCount;
@@ -44,8 +44,8 @@
* @param document
*
*/
- public BasicSelect(Document document) {
- mDocument = document;
+ public BasicSelect(Element rootElement) {
+ mRootElement = rootElement;
}
/**
1.5 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParser.java
Index: BasicLXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLXSQLParser.java 2001/11/09 11:59:31 1.4
+++ BasicLXSQLParser.java 2001/11/09 13:16:48 1.5
@@ -58,7 +58,7 @@
*/
public Select createSelectAction(SelectRequest request) throws
ActionException {
Document doc = parseLXSQLString(request.getSql());
- Select action = new BasicSelect(doc);
+ Select action = new BasicSelect(doc.getDocumentElement());
action.setDatabasePersistor(mDatabasePersistor);
return action;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
