hammant 01/11/11 13:44:47
Modified: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateIndex.java BasicCreateTable.java
BasicCreateView.java BasicSelect.java
apps/db/src/java/org/apache/avalon/db/basic/parser
BasicLXSQLParser.java
apps/db/src/java/org/apache/avalon/db/bcel/actions
BCELCreateTable.java
apps/db/src/java/org/apache/avalon/db/bcel/parser
BCELLXSQLParser.java BCELSQLParser.java
apps/db/src/java/org/apache/avalon/db/persistence/inmemory
NoPersistence.java
apps/db/src/java/org/apache/avalon/db/persistence/store
StorePersistence.java
apps/db/src/java/org/apache/avalon/db/services
DatabasePersistor.java
Log:
Persistece table/view operations migrated to Queryable
Revision Changes Path
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateIndex.java
Index: BasicCreateIndex.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateIndex.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicCreateIndex.java 2001/11/11 13:03:45 1.2
+++ BasicCreateIndex.java 2001/11/11 21:44:47 1.3
@@ -23,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BasicCreateIndex extends BasicCreateQueryable implements
CreateIndex {
@@ -60,7 +60,7 @@
AbstractQueryable tableOrView = null; //TODO
Index index = new BasicIndex(mIndexName, tableOrView);
- mDatabasePersistor.addIndex(mIndexName, index);
+ mDatabasePersistor.addQueryable(mIndexName, index);
if (mBasicSelect != null) {
mBasicSelect.execute();
1.7 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateTable.java
Index: BasicCreateTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicCreateTable.java 2001/11/11 13:03:45 1.6
+++ BasicCreateTable.java 2001/11/11 21:44:47 1.7
@@ -62,7 +62,7 @@
}
*/
Table table = new BasicTable(mTableName, mColumns);
- mDatabasePersistor.addTable(mTableName, table);
+ mDatabasePersistor.addQueryable(mTableName, table);
}
public int getRecordCount() {
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicCreateView.java 2001/11/11 13:03:45 1.7
+++ BasicCreateView.java 2001/11/11 21:44:47 1.8
@@ -29,7 +29,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class BasicCreateView extends BasicCreateQueryable implements
CreateView {
@@ -72,7 +72,7 @@
View view = new BasicView(mViewName, columns, mBasicSelect);
- mDatabasePersistor.addView(mViewName, view);
+ mDatabasePersistor.addQueryable(mViewName, view);
if (mBasicSelect != null) {
mBasicSelect.execute();
1.7 +1 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicSelect.java 2001/11/09 17:42:27 1.6
+++ BasicSelect.java 2001/11/11 21:44:47 1.7
@@ -75,7 +75,7 @@
Element rowNode = (Element)subFromNodes.item(j);
tablename = rowNode.getAttribute("name");
System.out.println("tablename=" + tablename);
- table = (BasicTable)
mDatabasePersistor.getTable(tablename);
+ table = (BasicTable)
mDatabasePersistor.getQueryable(tablename);
}
}
} else if
(subRootNodes.item(i).getNodeName().equals("where")) {
1.10 +2 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicLXSQLParser.java 2001/11/09 23:30:58 1.9
+++ BasicLXSQLParser.java 2001/11/11 21:44:47 1.10
@@ -85,7 +85,7 @@
Element rootElement = doc.getDocumentElement();
String tableName = rootElement.getAttribute("name");
- if(mDatabasePersistor.tableExists(tableName)) {
+ if(mDatabasePersistor.queryableExists(tableName)) {
throw new ActionException("Table exists already");
} else {
CreateTable action = new BasicCreateTable(tableName,
rootElement);
@@ -108,7 +108,7 @@
Document doc = parseLXSQLString(request.getSql());
Element rootElement = doc.getDocumentElement();
String tableName = rootElement.getAttribute("table-name");
- BasicTable table = (BasicTable)
mDatabasePersistor.getTable(tableName);
+ BasicTable table = (BasicTable)
mDatabasePersistor.getQueryable(tableName);
Insert action = new BasicInsert(table, doc);
action.setDatabasePersistor(mDatabasePersistor);
1.8 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELCreateTable.java
Index: BCELCreateTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELCreateTable.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BCELCreateTable.java 2001/11/07 12:01:14 1.7
+++ BCELCreateTable.java 2001/11/11 21:44:47 1.8
@@ -27,7 +27,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class BCELCreateTable extends AbstractBCELAction implements
CreateTable {
@@ -77,7 +77,7 @@
Class rowClass = mBCELHelper.makeGeneratedClass(mTableRowClassName,
bytes);
System.out.println("here 1b");
Table table = new BCELTable(mTableName, mColumns, rowClass);
- mDatabasePersistor.addTable(mTableName, table);
+ mDatabasePersistor.addQueryable(mTableName, table);
}
public int getRecordCount() {
1.3 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.java
Index: BCELLXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BCELLXSQLParser.java 2001/11/09 13:55:33 1.2
+++ BCELLXSQLParser.java 2001/11/11 21:44:47 1.3
@@ -174,7 +174,7 @@
System.out.println("=tn=" + tableName);
String uniqueTableName = bcelHelper.getGeneratedClassName(tableName);
System.out.println("=utn=" + uniqueTableName);
- BCELTable table = (BCELTable) mDatabasePersistor.getTable(tableName);
+ BCELTable table = (BCELTable)
mDatabasePersistor.getQueryable(tableName);
System.out.println("=table=" + table);
Insert action = new BCELInsert(table, doc);
action.setDatabasePersistor(mDatabasePersistor);
1.9 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.java
Index: BCELSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BCELSQLParser.java 2001/11/09 13:55:33 1.8
+++ BCELSQLParser.java 2001/11/11 21:44:47 1.9
@@ -40,7 +40,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class BCELSQLParser extends AbstractSQLParser {
@@ -137,7 +137,7 @@
String[] words = StringUtils.split(request.getSql());
String tableName = words[2];
- Table table = mDatabasePersistor.getTable(tableName);
+ Table table = (Table) mDatabasePersistor.getQueryable(tableName);
String type = words[3];
if (type.startsWith("(")) {
1.9 +5 -37
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java
Index: NoPersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NoPersistence.java 2001/11/11 13:03:45 1.8
+++ NoPersistence.java 2001/11/11 21:44:47 1.9
@@ -37,7 +37,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class NoPersistence extends AbstractLogEnabled
implements DatabasePersistor, Block, Contextualizable, Composable,
Configurable,
@@ -88,48 +88,16 @@
public void initialize() throws Exception {}
/**
- * Method getTable
+ * Method queryableExists
*
*
- * @param tableName
+ * @param queryableName
*
* @return
*
*/
- public Table getTable(String tableName) {
- return (Table) mAddressableObjects.get(tableName);
- }
-
- /**
- * Method tableExists
- *
- *
- * @param tableName
- *
- * @return
- *
- */
- public boolean tableExists(String tableName) {
- return mAddressableObjects.containsKey(tableName);
- }
-
- /**
- * Method addTable
- *
- *
- * @param tableName
- * @param table
- *
- */
- public void addTable(String tableName, Table table) {
- mAddressableObjects.put(tableName, table);
- }
- public void addView(String viewName, View view) {
- mAddressableObjects.put(viewName, view);
- }
-
- public void addIndex(String indexName, Index index) {
- mAddressableObjects.put(indexName, index);
+ public boolean queryableExists(String queryableName) {
+ return mAddressableObjects.containsKey(queryableName);
}
public Queryable getQueryable(String queryableName) {
1.8 +2 -36
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
Index: StorePersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StorePersistence.java 2001/11/11 13:03:45 1.7
+++ StorePersistence.java 2001/11/11 21:44:47 1.8
@@ -35,7 +35,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class StorePersistence extends AbstractLogEnabled
implements DatabasePersistor, Block, Contextualizable, Composable,
Configurable,
@@ -85,43 +85,9 @@
*/
public void initialize() throws Exception {}
- /**
- * Method getTable
- *
- *
- * @param tableName
- *
- * @return
- *
- */
- public Table getTable(String tableName) {
- return null;
- }
-
- /**
- * Method tableExists
- *
- *
- * @param tableName
- *
- * @return
- *
- */
- public boolean tableExists(String tableName) {
+ public boolean queryableExists(String queryableName) {
return false;
}
-
- /**
- * Method addTable
- *
- *
- * @param tableName
- * @param table
- *
- */
- public void addTable(String tableName, Table table) {}
- public void addView(String viewName, View view) {}
- public void addIndex(String indexName, Index index) {}
public Queryable getQueryable(String queryableName) {
return null;
1.7 +2 -35
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabasePersistor.java
Index: DatabasePersistor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabasePersistor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatabasePersistor.java 2001/11/11 13:03:45 1.6
+++ DatabasePersistor.java 2001/11/11 21:44:47 1.7
@@ -21,46 +21,13 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.6 $
+ * @version * $Revision: 1.7 $
*/
public interface DatabasePersistor {
- /**
- * Method getTable
- *
- *
- * @param tableName
- *
- * @return
- *
- */
- Table getTable(String tableName);
Queryable getQueryable(String queryableName);
- /**
- * Method tableExists
- *
- *
- * @param tableName
- *
- * @return
- *
- */
- boolean tableExists(String tableName);
-
- /**
- * Method addTable
- *
- *
- * @param tableName
- * @param table
- *
- */
- void addTable(String tableName, Table table);
-
- void addView(String viewName, View table);
-
- void addIndex(String indexName, Index index);
+ boolean queryableExists(String queryableName);
void addQueryable(String queryableName, Queryable queryable);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
