rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -134,7 +134,7 @@ public class DBAdapter extends RubyBasic
 	}
 	
 	public IDBResult executeSQLReportNonUnique(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4)throws DBException{
-		LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
+		//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
 		
 		Object[] values = {arg1,arg2,arg3,arg4};
 		IDBResult res = null;
@@ -149,8 +149,24 @@ public class DBAdapter extends RubyBasic
 		return res; 
 	}
 
+	public IDBResult executeSQLReportNonUnique(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)throws DBException{
+		//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
+		
+		Object[] values = {arg1,arg2,arg3,arg4, arg5, arg6, arg7};
+		IDBResult res = null;
+		Lock();
+		try{
+			res = m_dbStorage.executeSQL(strStatement,values, true);
+		}finally
+		{
+			Unlock();
+		}
+		
+		return res; 
+	}
+	
 	public IDBResult executeSQLReportNonUniqueEx(String strStatement, Vector vecValues)throws DBException{
-		LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
+		//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
 		
 		Object[] values = new Object[vecValues.size()];
 		for (int i = 0; i < vecValues.size(); i++ )
@@ -248,7 +264,7 @@ public class DBAdapter extends RubyBasic
     
     private String getSqlScript()
     {
-    	return RhoConf.getInstance().loadFileFromJar("apps/db/syncdb.schema");
+    	return RhoFile.readStringFromJarFile("apps/db/syncdb.schema", this);
     }
     
     public void startTransaction()throws DBException
@@ -264,7 +280,8 @@ public class DBAdapter extends RubyBasic
     	m_nTransactionCounter--;
     	if (m_nTransactionCounter == 0)
     	{
-	    	getAttrMgr().save(this);
+    		m_dbStorage.onBeforeCommit();
+	    	//getAttrMgr().save(this);
 	    	m_dbStorage.commit();
     	}
     	
@@ -457,7 +474,27 @@ public class DBAdapter extends RubyBasic
 		
 	    if ( bRhoReset && !bAppReset )
 	        bRhoReset = !migrateDB(dbVer, strRhoDBVer, strAppDBVer);
-
+	    else if ( Capabilities.USE_SQLITE )
+	    {
+	    	IFileAccess fs = RhoClassFactory.createFileAccess();
+			String dbName = getNameNoExt(m_strDBPath);
+		    String dbNameScript = dbName + ".script";
+			String dbNameData = dbName + ".data";
+		    String dbNameJournal = dbName + ".journal";
+		    String dbNameProperties = dbName + ".properties";
+	    	
+	    	if ( fs.exists(dbNameScript) )
+	    	{
+	    		LOG.INFO("Remove hsqldb and use sqlite for Blackberry>=5.");
+	    		
+	    		fs.delete(dbNameScript);
+	    		fs.delete(dbNameData);
+	    		fs.delete(dbNameJournal);
+	    		fs.delete(dbNameProperties);
+	    		bRhoReset = true;
+	    	}
+	    }
+	    
 		if ( bRhoReset || bAppReset )
 		{
 			IDBStorage db = null;
@@ -468,7 +505,7 @@ public class DBAdapter extends RubyBasic
 				{
 					db.open( m_strDBPath, "" );
 			    	IDBResult res = db.executeSQL("SELECT * FROM client_info", null, false);
-			    	if ( !res.isEnd() )
+			    	if ( !res.isOneEnd() )
 			    	{
 			    		m_strClientInfoInsert = createInsertStatement(res, "client_info");
 			    		m_dataClientInfo = res.getCurData();
@@ -493,6 +530,9 @@ public class DBAdapter extends RubyBasic
 			DBAdapter.makeBlobFolderName(); //Create folder back
 			
             writeDBVersion(new DBVersion(strRhoDBVer, strAppDBVer) );
+            
+            if ( RhoConf.getInstance().isExist("bulksync_state") && RhoConf.getInstance().getInt("bulksync_state") != 0)
+            	RhoConf.getInstance().setInt("bulksync_state", 0, true);            
 		}
 		
 	}
@@ -544,7 +584,7 @@ public class DBAdapter extends RubyBasic
 		//executeSQL("CREATE INDEX by_src ON object_values (source_id)", null);
 		m_bIsOpen = true;
 		
-		getAttrMgr().load(this);
+		//getAttrMgr().load(this);
 		
 		m_dbStorage.setDbCallback(new DBCallback(this));
 		
@@ -559,7 +599,7 @@ public class DBAdapter extends RubyBasic
         	m_dbStorage.executeSQL(m_strClientInfoInsert, m_dataClientInfo, false );
         	
             IDBResult res = executeSQL( "SELECT client_id FROM client_info" );
-            if ( !res.isEnd() &&  res.getStringByIdx(0).length() > 0 )
+            if ( !res.isOneEnd() &&  res.getStringByIdx(0).length() > 0 )
             {
                 LOG.INFO("Set reset=1 in client_info");
                 executeSQL( "UPDATE client_info SET reset=1" );
@@ -612,15 +652,7 @@ public class DBAdapter extends RubyBasic
 	
 	public boolean isTableExist(String strTableName)throws DBException
 	{
-		String[] vecTables = m_dbStorage.getAllTableNames();
-		for ( int i = 0; i< vecTables.length; i++ )
-		{
-			String tableName = vecTables[i];
-			if ( tableName.equalsIgnoreCase(strTableName) )
-				return true;
-		}
-		
-		return false;
+		return m_dbStorage.isTableExists(strTableName);
 	}
 	
     private RubyValue rb_destroy_tables(RubyValue vInclude, RubyValue vExclude) 
@@ -630,7 +662,7 @@ public class DBAdapter extends RubyBasic
 		
 		IDBStorage db = null;
 		try{
-		    getAttrMgr().reset(this);
+		    //getAttrMgr().reset(this);
 			
 			Vector vecIncludes = RhoRuby.makeVectorStringFromArray(vInclude);
 			Vector vecExcludes = RhoRuby.makeVectorStringFromArray(vExclude);
@@ -645,7 +677,9 @@ public class DBAdapter extends RubyBasic
 		    String dbNameScript = dbName + ".script";
 		    String dbNewNameScript = dbNewName + ".script";
 		    String dbNameJournal = dbName + ".journal";
+		    String dbNameJournal2 = dbName + ".data-journal";
 		    String dbNewNameJournal = dbNewName + ".journal";
+		    String dbNewNameJournal2 = dbNewName + ".data-journal";
 		    String dbNewNameProps = dbNewName + ".properties";
 		    
 			//LOG.TRACE("DBAdapter: " + dbNewNameDate + ": " + (fs.exists(dbNewNameData) ? "" : "not ") + "exists");
@@ -654,6 +688,7 @@ public class DBAdapter extends RubyBasic
 		    fs.delete(dbNewNameScript);
 		    //LOG.TRACE("DBAdapter: " + dbNewNameJournal + ": " + (fs.exists(dbNewNameJournal) ? "" : "not ") + "exists");
 		    fs.delete(dbNewNameJournal);
+		    fs.delete(dbNewNameJournal2);
 		    fs.delete(dbNewNameProps);
 		    
 		    LOG.TRACE("1. Size of " + dbNameData + ": " + fs.size(dbNameData));
@@ -662,7 +697,7 @@ public class DBAdapter extends RubyBasic
 			db.open( dbNewName, getSqlScript() );
 			
 			String[] vecTables = m_dbStorage.getAllTableNames();
-			IDBResult res;
+			//IDBResult res;
 	
 		    db.startTransaction();
 			
@@ -686,13 +721,15 @@ public class DBAdapter extends RubyBasic
 		    
 		    fs.delete(dbNewNameProps);
 		    fs.delete(dbNameJournal);
+		    fs.delete(dbNameJournal2);
 		    
 			String fName = makeBlobFolderName();
 			RhoClassFactory.createFile().delete(fName);
 			DBAdapter.makeBlobFolderName(); //Create folder back
 		    
 		    fs.renameOverwrite(dbNewNameData, dbNameData);
-		    fs.renameOverwrite(dbNewNameScript, dbNameScript);
+		    if ( !Capabilities.USE_SQLITE )
+		    	fs.renameOverwrite(dbNewNameScript, dbNameScript);
 		    
 		    LOG.TRACE("3. Size of " + dbNameData + ": " + fs.size(dbNameData));
 		    
@@ -700,7 +737,7 @@ public class DBAdapter extends RubyBasic
 			m_dbStorage.open(m_strDBPath, getSqlScript() );
 			m_bIsOpen = true;
 			
-			getAttrMgr().load(this);
+			//getAttrMgr().load(this);
 			
 			m_dbStorage.setDbCallback(new DBCallback(this));
 			
@@ -746,8 +783,75 @@ public class DBAdapter extends RubyBasic
 	    }
     }
     
+    public void updateAllAttribChanges()throws DBException
+    {
+	    //Check for attrib = object
+	    IDBResult res = executeSQL("SELECT object, source_id, update_type " +
+	        "FROM changed_values where attrib = 'object' and sent=0" );
+
+	    if ( res.isEnd() )
+	        return;
+
+	    startTransaction();
+
+	    Vector/*<String>*/ arObj = new Vector(), arUpdateType = new Vector();
+	    Vector/*<int>*/ arSrcID = new Vector();
+	    for( ; !res.isEnd(); res.next() )
+	    {
+	        arObj.addElement(res.getStringByIdx(0));
+	        arSrcID.addElement(new Integer(res.getIntByIdx(1)));
+	        arUpdateType.addElement(res.getStringByIdx(2));
+	    }
+        
+        for( int i = 0; i < (int)arObj.size(); i++ )
+        {
+            IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
+            boolean bSchemaSource = false;
+            String strTableName = "object_values";
+            if ( !resSrc.isEnd() )
+            {
+                bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
+                if ( bSchemaSource )
+                    strTableName = resSrc.getStringByIdx(0);
+            }
+
+            if (bSchemaSource)
+            {
+                IDBResult res2 = executeSQL( "SELECT * FROM " + strTableName + " where object=?", arObj.elementAt(i) );
+                for( int j = 0; j < res2.getColCount(); j ++)
+                {
+                    String strAttrib = res2.getColName(j);
+                    String value = res2.getStringByIdx(j);
+                    String attribType = getAttrMgr().isBlobAttr((Integer)arSrcID.elementAt(i), strAttrib) ? "blob.file" : "";
+
+    	            executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+        	                arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, new Integer(0) );
+                }
+            }else
+            {
+                IDBResult res2 = executeSQL( "SELECT attrib, value FROM " + strTableName + " where object=? and source_id=?", 
+                    arObj.elementAt(i), arSrcID.elementAt(i) );
+
+    	        for( ; !res2.isEnd(); res2.next() )
+    	        {
+    	            String strAttrib = res2.getStringByIdx(0);
+    	            String value = res2.getStringByIdx(1);
+    	            String attribType = getAttrMgr().isBlobAttr((Integer)arSrcID.elementAt(i), strAttrib) ? "blob.file" : "";
+
+    	            executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+    	                arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, new Integer(0) );
+    	        }
+            }
+        }
+
+        executeSQL("DELETE FROM changed_values WHERE attrib='object'"); 
+
+        endTransaction();
+    }
+    
     void copyChangedValues(DBAdapter db)throws DBException
     {
+    	updateAllAttribChanges();    	
         copyTable("changed_values", m_dbStorage, db.m_dbStorage );
         {
             Vector/*<int>*/ arOldSrcs = new Vector();
@@ -761,11 +865,11 @@ public class DBAdapter extends RubyBasic
                 int nOldSrcID = ((Integer)arOldSrcs.elementAt(i)).intValue();
 
                 IDBResult res = executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID);
-                if ( !res.isEnd() )
+                if ( !res.isOneEnd() )
                 {
                     String strSrcName = res.getStringByIdx(0);
                     IDBResult res2 = db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName );
-                    if ( !res2.isEnd() )
+                    if ( !res2.isOneEnd() )
                     {
                         if ( nOldSrcID != res2.getIntByIdx(0) )
                         {
@@ -787,6 +891,7 @@ public class DBAdapter extends RubyBasic
 		try{
 			db = (DBAdapter)alloc(null); 
     		db.openDB(fDbName, true);
+    		db.m_dbStorage.createTriggers();
     		db.setDbPartition(m_strDbPartition);
 			
 		    db.startTransaction();
@@ -829,9 +934,11 @@ public class DBAdapter extends RubyBasic
 			String dbNameData = dbName + ".data";
 		    String dbNameScript = dbName + ".script";
 		    String dbNameJournal = dbName + ".journal";
+		    String dbNameJournal2 = dbName + ".data-journal";		    
 		    String dbNewNameProps = getNameNoExt(fDbName) + ".properties";
 		    
 		    fs.delete(dbNameJournal);
+		    fs.delete(dbNameJournal2);
 		    fs.delete(dbNewNameProps);
 		    
 			String fName = makeBlobFolderName();
@@ -839,13 +946,14 @@ public class DBAdapter extends RubyBasic
 			DBAdapter.makeBlobFolderName(); //Create folder back
 		    
 		    fs.renameOverwrite(fDbName, dbNameData);
-		    fs.renameOverwrite(fScriptName, dbNameScript);
+		    if ( !Capabilities.USE_SQLITE )
+		    	fs.renameOverwrite(fScriptName, dbNameScript);
 		    
 		    m_dbStorage = RhoClassFactory.createDBStorage();
 			m_dbStorage.open(m_strDBPath, getSqlScript() );
 			m_bIsOpen = true;
 			
-			getAttrMgr().load(this);
+			//getAttrMgr().load(this);
 			
 			m_dbStorage.setDbCallback(new DBCallback(this));
 			
@@ -904,7 +1012,7 @@ public class DBAdapter extends RubyBasic
     		String strSql = v.toStr();
     		if ( batch == RubyConstant.QTRUE )
     		{
-    			LOG.INFO("batch execute:" + strSql);
+    			//LOG.INFO("batch execute:" + strSql);
     			
     			executeBatchSQL( strSql );
     		}
@@ -940,13 +1048,18 @@ public class DBAdapter extends RubyBasic
 	    		}
 	    		
 	    		IDBResult rows = executeSQL( strSql, values);
-	    		RubyString[] colNames = getOrigColNames(rows);
+	    		RubyString[] colNames = null;
 	    		
 	    		for( ; !rows.isEnd(); rows.next() )
 	    		{
 	    			RubyHash row = ObjectFactory.createHash();
 	    			for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
+	    			{
+	    				if ( colNames == null )
+	    					colNames = getOrigColNames(rows);
+	    				
 	    				row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) );
+	    			}
 	    			
 	    			res.add( row );
 	    		}
@@ -962,7 +1075,7 @@ public class DBAdapter extends RubyBasic
     
     //@RubyAllocMethod
     private static RubyValue alloc(RubyValue receiver) {
-    	return new DBAdapter(RubyRuntime.DatabaseClass);
+    	return new DBAdapter((RubyClass) receiver);
     }
     
     public static void closeAll()
@@ -982,6 +1095,8 @@ public class DBAdapter extends RubyBasic
 		{
 			DBAdapter db = (DBAdapter)enumDBs.nextElement();
 			db.getAttrMgr().loadBlobAttrs(db);
+			if ( !db.getAttrMgr().hasBlobAttrs() )
+				db.m_dbStorage.setDbCallback(null);
 		}
     }
     
@@ -995,6 +1110,18 @@ public class DBAdapter extends RubyBasic
         return (DBAdapter)getDBPartitions().get(szPartition);
     }
 
+    public static Vector/*<String>*/ getDBAllPartitionNames()
+    {
+        Vector/*<String>*/ vecNames = new Vector();
+        Enumeration enumDBs = m_mapDBPartitions.keys();
+		while (enumDBs.hasMoreElements()) 
+		{
+			vecNames.addElement(enumDBs.nextElement());
+		}
+		
+        return vecNames;
+    }
+        
     public static boolean isAnyInsideTransaction()
     {
     	Enumeration enumDBs = m_mapDBPartitions.elements();
@@ -1174,30 +1301,47 @@ public class DBAdapter extends RubyBasic
 				LOG.ERROR("DBCallback.OnDeleteAllFromTable: Error delete files from table: " + tableName, exc);				
 			}
 		}*/
-
+/*
 		public void onAfterInsert(String tableName, IDBResult rows2Insert)
 		{
-			if ( !tableName.equalsIgnoreCase("object_values") )
-				return;
-
-			for( ; !rows2Insert.isEnd(); rows2Insert.next() )
+			try
+			{
+				if ( !tableName.equalsIgnoreCase("object_values") )
+					return;
+	
+				for( ; !rows2Insert.isEnd(); rows2Insert.next() )
+				{
+					//Object[] data = rows2Insert.getCurData();
+					Integer nSrcID = new Integer(rows2Insert.getIntByIdx(0));
+					String attrib = rows2Insert.getStringByIdx(1);
+					m_db.getAttrMgr().add(nSrcID, attrib);
+				}
+			}catch(DBException exc)
 			{
-				Object[] data = rows2Insert.getCurData();
-				Integer nSrcID = new Integer(rows2Insert.getIntByIdx(0));
-				String attrib = (String)data[1];
-				m_db.getAttrMgr().add(nSrcID, attrib);
+				LOG.ERROR("onAfterInsert failed.", exc);
 			}
-			
-		}
+		}*/
 		
 		public void onBeforeUpdate(String tableName, IDBResult rows2Delete, int[] cols)
 		{
-			processDelete(tableName, rows2Delete, cols);
+			try
+			{
+				processDelete(tableName, rows2Delete, cols);
+			}catch(DBException exc)
+			{
+				LOG.ERROR("onAfterInsert failed.", exc);
+			}
 		}
 		
 		public void onBeforeDelete(String tableName, IDBResult rows2Delete) 
 		{
-			processDelete(tableName, rows2Delete, null);
+			try
+			{
+				processDelete(tableName, rows2Delete, null);
+			}catch(DBException exc)
+			{
+				LOG.ERROR("onAfterInsert failed.", exc);
+			}
 		}
 		
 		private boolean isChangedCol(int[] cols, int iCol)
@@ -1213,7 +1357,7 @@ public class DBAdapter extends RubyBasic
 			return false;
 		}
 		
-		private void processDelete(String tableName, IDBResult rows2Delete, int[] cols)
+		private void processDelete(String tableName, IDBResult rows2Delete, int[] cols) throws DBException
 		{
 			if ( tableName.equalsIgnoreCase("changed_values") || tableName.equalsIgnoreCase("sources") ||
 			     tableName.equalsIgnoreCase("client_info"))
@@ -1237,23 +1381,21 @@ public class DBAdapter extends RubyBasic
 			
 			for( ; !rows2Delete.isEnd(); rows2Delete.next() )
 			{
-				Object[] data = rows2Delete.getCurData();
-				
 				if ( !bSchemaSrc )
 				{
-					if ( nSrcID == null )
-						nSrcID = new Integer(rows2Delete.getIntByIdx(0));
+					nSrcID = new Integer(rows2Delete.getIntByIdx(0));
 					
-					String attrib = (String)data[1];
-					String value = (String)data[3];
+					String attrib = rows2Delete.getStringByIdx(1);
+					String value = rows2Delete.getStringByIdx(3);
 
-					if (cols == null) //delete
-						m_db.getAttrMgr().remove(nSrcID, attrib);
+					//if (cols == null) //delete
+					//	m_db.getAttrMgr().remove(nSrcID, attrib);
 					
 				    if ( m_db.getAttrMgr().isBlobAttr(nSrcID, attrib) )
 				    	processBlobDelete(nSrcID, attrib, value);
 				}else
 				{
+					Object[] data = rows2Delete.getCurData();
 					for ( int i = 0; i < rows2Delete.getColCount(); i++ )
 					{
 						if (!isChangedCol(cols, i))

data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java

@@ -8,122 +8,11 @@ import com.xruby.runtime.lang.RubyValue;
 import com.rho.RhoRuby;
 
 public class DBAttrManager {
-    private Mutex m_mxSrcAttrs = new Mutex();
-    private Hashtable/*< int, Hashtable<String,int>* >*/ m_mapSrcAttrs = new Hashtable();
+    //private Mutex m_mxSrcAttrs = new Mutex();
+    //private Hashtable/*< int, Hashtable<String,int>* >*/ m_mapSrcAttrs = new Hashtable();
     private Hashtable/*Ptr< int, Hashtable<String,int>* >*/ m_mapBlobAttrs = new Hashtable();
     private Hashtable/*Ptr< String, int>*/ m_mapSrcNames = new Hashtable();
 
-    public void add( Integer nSrcID, String szAttr )
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-	        Hashtable/*<String,int>*/ mapAttr = (Hashtable)m_mapSrcAttrs.get(nSrcID);
-	        if ( mapAttr != null )
-	        {
-	            int nCount = 0;
-	            if ( mapAttr.containsKey(szAttr) )
-	                nCount = ((Integer)mapAttr.get(szAttr)).intValue();
-	
-	            mapAttr.put(szAttr, new Integer(nCount+1));
-	        }else
-	        {
-	            mapAttr = new Hashtable/*<String,int>*/();
-	            mapAttr.put(szAttr, new Integer(1));
-	            m_mapSrcAttrs.put(nSrcID,mapAttr);
-	        }
-    	}
-    }
-
-    public void remove( Integer nSrcID, String szAttr )
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-	        Hashtable/*<String,int>*/ mapAttr = (Hashtable)m_mapSrcAttrs.get(nSrcID);
-	        if ( mapAttr != null )
-	        {
-	            if ( mapAttr.containsKey(szAttr) )
-	            {
-	                int nCount = ((Integer)mapAttr.get(szAttr)).intValue();
-	                nCount--;
-	                if ( nCount <= 0 )
-	                    mapAttr.remove(szAttr);
-	                else
-	                    mapAttr.put(szAttr, new Integer(nCount));
-	            }
-	        }
-    	}
-    }
-
-    public void save(DBAdapter db)throws DBException
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-        	Enumeration valsSrc = m_mapSrcAttrs.elements();
-        	Enumeration keysSrc = m_mapSrcAttrs.keys();
-    		while (valsSrc.hasMoreElements()) 
-    		{
-    			Integer nSrcID = (Integer)keysSrc.nextElement();
-    			Hashtable mapAttr = (Hashtable)valsSrc.nextElement();
-    			
-	            String strAttribs = "";
-	            Enumeration valsAttrs = mapAttr.elements();
-	        	Enumeration keysAttrs = mapAttr.keys();
-	            
-	        	while (valsAttrs.hasMoreElements())
-	            {
-	        		String strAttr = (String)keysAttrs.nextElement();
-	        		Integer nCounter = (Integer)valsAttrs.nextElement();
-	                if ( strAttribs.length() > 0 )
-	                    strAttribs += ',';
-	
-	                strAttribs += strAttr + ',' + nCounter;
-	            }
-	
-	            db.executeSQL("UPDATE sources SET source_attribs=? where source_id=?", strAttribs, nSrcID );
-	        }
-    	}
-    }
-
-    public void load(DBAdapter db)throws DBException
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-    		loadAttrs(db, m_mapSrcAttrs, "source_attribs", null);
-    	}
-    }
-
-    public void reset(DBAdapter db)throws DBException
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-	        m_mapSrcAttrs.clear();
-	        db.executeSQL("UPDATE sources SET source_attribs=?", "" );
-    	}
-    }
-
-    public RubyValue getAttrsBySrc(int iSrcID)
-    {
-    	synchronized(m_mxSrcAttrs)
-    	{
-    		Integer nSrcID = new Integer(iSrcID);
-    		RubyValue arRes = RhoRuby.create_array();
-    		
-	        Hashtable/*<String,int>*/ mapAttr = (Hashtable)m_mapSrcAttrs.get(nSrcID);
-	        if ( mapAttr != null )
-	        {
-	        	Enumeration keysAttrs = mapAttr.keys();
-	        	while (keysAttrs.hasMoreElements())
-	            {
-	        		String strAttr = (String)keysAttrs.nextElement();
-	            	RubyValue valStr = RhoRuby.create_string(strAttr);
-	            	RhoRuby.add_to_array(arRes,valStr);
-	            }
-	        }
-
-	        return arRes;
-    	}
-    }
-
     public boolean isBlobAttr(Integer nSrcID, String szAttr)
     {
         Hashtable/*<String,int>**/ mapAttr = (Hashtable)m_mapBlobAttrs.get(nSrcID);
@@ -133,6 +22,11 @@ public class DBAttrManager {
         return false;
     }
 
+    public boolean hasBlobAttrs()
+    {
+    	return m_mapBlobAttrs.size() > 0;
+    }
+    
     public Integer getSrcIDHasBlobsByName(String strName)
     {
     	Integer nSrcID = (Integer)m_mapSrcNames.get(strName);
@@ -155,7 +49,7 @@ public class DBAttrManager {
         return false;
     }
 
-    void loadBlobAttrs(DBAdapter db)throws DBException
+    public void loadBlobAttrs(DBAdapter db)throws DBException
     {
         loadAttrs(db, m_mapBlobAttrs, "blob_attribs", m_mapSrcNames);
         //TODO: update/delete trigger for schema sources

data/platform/bb/RubyVM/src/com/rho/db/DBException.java

@@ -2,7 +2,7 @@ package com.rho.db;
 
 public class DBException extends Exception {
 	public DBException(Throwable exc){
-		super(exc.getMessage());
+		super("Class name:" + exc.getClass().getName() + ";Message: " + exc.getMessage() != null ? exc.getMessage() : "");
 	}
 	public DBException(String msg){
 		super(msg);

data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java

@@ -4,5 +4,5 @@ public interface IDBCallback
 {
 	public abstract void onBeforeDelete(String tableName, IDBResult rows2Delete);
 	public abstract void onBeforeUpdate(String tableName, IDBResult rows2Insert, int[] cols);
-	public abstract void onAfterInsert(String tableName, IDBResult rows2Insert);
+	//public abstract void onAfterInsert(String tableName, IDBResult rows2Insert);
 }

data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java

@@ -22,7 +22,8 @@ public interface IDBResult {
 	
 	//New
     public abstract boolean isEnd();
-    public abstract void next();
+    public abstract boolean isOneEnd() throws DBException;
+    public abstract void next() throws DBException;
 	public abstract String getStringByIdx(int nCol);
 	public abstract int getIntByIdx(int nCol);
 	public abstract long getLongByIdx(int nCol);
@@ -35,8 +36,9 @@ public interface IDBResult {
 	public abstract int getInt(String colname);
 	public abstract String getString(String colname);
 	
-	public abstract Object[] getCurData();
+	public abstract Object[] getCurData() throws DBException;
 	
     public abstract boolean isNonUnique();
-
+    
+    public abstract void close();
 }

data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java

@@ -6,6 +6,7 @@ public interface IDBStorage {
 	public abstract void close()throws DBException;
 	
 	public abstract IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)throws DBException;
+	
 	public abstract void executeBatchSQL(String strStatement)throws DBException;
 	
 	public abstract IDBResult createResult();
@@ -15,10 +16,13 @@ public interface IDBStorage {
 	public abstract void startTransaction()throws DBException;
 	public abstract void commit()throws DBException;
 	public abstract void rollback()throws DBException;
+	public abstract void onBeforeCommit() throws DBException;
 	
 	public abstract void setDbCallback(IDBCallback callback);
 	
 	public abstract String[] getAllTableNames()throws DBException;
+	public abstract boolean isTableExists(String strName)throws DBException;
 	
-	public boolean isDbFileExists(String strPath);
+	public abstract boolean isDbFileExists(String strPath);
+	public abstract void createTriggers() throws DBException;
 }