rhodes 1.5.5 → 2.0.0.beta1

data/platform/android/build/libruby_build.files

@@ -26,10 +26,11 @@ platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c
 platform/shared/ruby/ext/geolocation/geolocation_wrap.c
 platform/shared/ruby/ext/mapview/mapview_wrap.c
 platform/shared/ruby/ext/nativebar/nativebar_wrap.c
+platform/shared/ruby/ext/navbar/navbar_wrap.c
 platform/shared/ruby/ext/phonebook/phonebook_wrap.c
+platform/shared/ruby/ext/rho/extensions.c
 platform/shared/ruby/ext/rho/rhoruby.c
 platform/shared/ruby/ext/rho/rhosupport.c
-platform/shared/ruby/ext/rho/extensions.c
 platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c
 platform/shared/ruby/ext/ringtones/ringtones_wrap.c
 platform/shared/ruby/ext/socket/socket.c

data/platform/bb/Hsqldb/Hsqldb.jdp

@@ -27,10 +27,7 @@ src\com\rho\db\HsqlDBResult.java
 src\com\rho\db\HsqlDBRowResult.java
 src\com\rho\db\HsqlDBStorage.java
 src\com\rho\db\Journal.java
-src\com\rho\db\RandomAccessFile.java
 src\com\rho\file\FileAccessBB.java
-src\com\rho\file\Jsr75RAFileImpl.java
-src\com\rho\file\PersistRAFileImpl.java
 src\j2me\io\BufferedOutputStream.java
 src\j2me\io\FilterOutputStream.java
 src\j2me\math\BigDecimal.java

data/platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java

@@ -7,7 +7,7 @@ import java.util.Random;
 import org.hsqldb.lib.FileAccess;
 
 import com.rho.RhoClassFactory;
-import com.rho.IRAFile;
+import com.rho.file.IRAFile;
 
 /**
  * A collection of static file management methods.<p>

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java

@@ -33,7 +33,8 @@ public class HsqlDBResult implements IDBResult
 			 m_result.getException() instanceof HsqlException )
 		{
 			HsqlException e = (HsqlException)m_result.getException();
-			return e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX;
+			return e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX ||
+				e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_CONSTRAINT;
 		}
 		
 		return false;
@@ -51,6 +52,20 @@ public class HsqlDBResult implements IDBResult
 		//AS alias
 		return md.colNames[nCol];
 	}
+
+	public String getOrigColName(int nCol){
+		Result.ResultMetaData md = m_result.metaData;
+		if ( md.tableNames[nCol] != null && md.tableNames[nCol].length() > 0 )
+		{
+			if ( md.colOrigNames[nCol] != null )
+				return md.colOrigNames[nCol];
+			
+			return md.colNames[nCol].toLowerCase();
+		}
+		
+		//AS alias
+		return md.colNames[nCol];
+	}
 	
 	public Result getResult(){
 		return m_result;

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java

@@ -46,6 +46,11 @@ public class HsqlDBRowResult extends HsqlDBResult {
     	m_row = null;
     }
     
+    public Object[] getCurData()
+    {
+    	return m_row.getData();
+    }
+    
     protected Object getCurValue(int nCol)
     {
     	return m_row.getData()[nCol];

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java

@@ -68,6 +68,18 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 		}
 	}
 
+	public void executeBatchSQL(String strSqlScript)throws DBException
+	{
+		if ( m_dbSess == null )
+			throw new RuntimeException("executeSQL: m_dbSess == null");
+		
+		Result res = m_dbSess.sqlExecuteDirectNoPreChecks(strSqlScript);
+		if ( res.getException() != null )
+			throw new DBException(res.getException());
+		
+		m_dbSess.commitSchema();
+	}
+	
 /*    static class HsqlDeleteTrigger implements org.hsqldb.Trigger {
 
         public void fire(int i, String name, String table, Object[] row1,
@@ -77,21 +89,30 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
     }
 */ 
 	//IDBCallback
-	public void onDeleteRow(Table table, Row row) {
+	public void onBeforeDelete(Table table, Row row) {
 		if ( m_dbCallback == null )
 			return;
 		
 		m_rowResult.init(table, row);
-		m_dbCallback.OnDeleteFromTable(table.getName().name, m_rowResult );
+		m_dbCallback.onBeforeDelete(table.getName().name, m_rowResult );
 	}
 
-	public void onInsertRow(Table table, Row row) {
+	public void onAfterInsert(Table table, Row row) {
 		if ( m_dbCallback == null )
 			return;
 		
 		m_rowResult.init(table, row);
-		m_dbCallback.OnInsertIntoTable(table.getName().name, m_rowResult );
+		m_dbCallback.onAfterInsert(table.getName().name, m_rowResult );
 	}
+	
+	public void onBeforeUpdate(Table table, Row row, int[] cols) {
+		if ( m_dbCallback == null )
+			return;
+		
+		m_rowResult.init(table, row);
+		m_dbCallback.onBeforeUpdate(table.getName().name, m_rowResult, cols );
+	}
+	
 	//IDBCallback
 	
 	public void setDbCallback(IDBCallback callback)

data/platform/bb/Hsqldb/src/com/rho/db/Journal.java

@@ -2,7 +2,7 @@ package com.rho.db;
 
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
-import com.rho.db.RandomAccessFile;
+import com.rho.file.RandomAccessFile;
 import java.io.IOException;
 import java.io.EOFException;
 

data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java

@@ -1,6 +1,5 @@
 package com.rho.file;
 
-import com.rho.IFileAccess;
 import com.rho.db.FileUtilBB;
 
 public class FileAccessBB implements IFileAccess {

data/platform/bb/Hsqldb/src/j2me/math/Number.java

@@ -21,7 +21,8 @@ public class Number{
     	else if ( obj instanceof Byte )
     		return ((Byte)obj).byteValue();
     	
-    	return Integer.parseInt(obj.toString());
+    	String strRes = obj.toString();
+    	return strRes==null || strRes.length() == 0 ? 0 : Integer.parseInt(strRes);
     }
 	
     public static long longValue(Object obj){
@@ -34,7 +35,8 @@ public class Number{
     	else if ( obj instanceof Byte )
     		return ((Byte)obj).byteValue();
     	
-    	return Long.parseLong(obj.toString());
+    	String strRes = obj.toString();
+    	return strRes==null || strRes.length() == 0 ? 0 : Long.parseLong(strRes);
     }
     
     public static double doubleValue(Object obj){
@@ -51,7 +53,8 @@ public class Number{
     	else if ( obj instanceof Byte )
     		return ((Byte)obj).byteValue();
     	
-    	return Double.parseDouble(obj.toString());
+    	String strRes = obj.toString();
+    	return strRes==null || strRes.length() == 0 ? 0 : Double.parseDouble(strRes);
     }
     
     /*

data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java

@@ -103,7 +103,8 @@ final class CompiledStatementExecutor {
 
             result = executeImpl(cs);
         } catch (HsqlException e) {
-        	if ( e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX &&
+        	if ( (e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX ||
+        		  e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_CONSTRAINT) &&
         			bReportNonUnique )
         	{}
         	else

data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java

@@ -260,6 +260,7 @@ public class Expression {
     private String      schema;
     private String      tableName;
     private String      columnName;
+    public String       columnNameOrig;
     private TableFilter tableFilter;                // null if not yet resolved
     TableFilter         outerFilter;                // defined if this is part of an OUTER JOIN condition tree
 

data/platform/bb/Hsqldb/src/org/hsqldb/Parser.java

@@ -2009,6 +2009,7 @@ class Parser {
 
         String     name = sToken;
         Expression r    = new Expression(sTable, name, wasQuoted);
+        r.columnNameOrig = tokenizer.sTokenOrig;
 
         read();
 

data/platform/bb/Hsqldb/src/org/hsqldb/Result.java

@@ -142,6 +142,7 @@ public class Result {
         public String[]  colLabels;
         public String[]  tableNames;
         public String[]  colNames;
+        public String[]  colOrigNames;
         public boolean[] isLabelQuoted;
         public int[]     colTypes;
         public int[]     colSizes;
@@ -179,6 +180,7 @@ public class Result {
             colLabels     = new String[columns];
             tableNames    = new String[columns];
             colNames      = new String[columns];
+            colOrigNames  = new String[columns];
             isLabelQuoted = new boolean[columns];
             colTypes      = new int[columns];
             colSizes      = new int[columns];

data/platform/bb/Hsqldb/src/org/hsqldb/Select.java

@@ -445,6 +445,7 @@ class Select {
                 rmd.schemaNames[i]   = e.getTableSchemaName();
                 rmd.tableNames[i]    = e.getTableName();
                 rmd.colNames[i]      = e.getColumnName();
+                rmd.colOrigNames[i]  = e.columnNameOrig;
 
                 if (rmd.isTableColumn(i)) {
                     rmd.colNullable[i] = e.nullability;
@@ -637,12 +638,17 @@ class Select {
         int limitCount = 0;
 
         if (limitCondition != null) {
-            Integer limit =
-                (Integer) limitCondition.getArg2().getValue(session);
-
-            if (limit != null) {
-                limitCount = limit.intValue();
-            }
+        	Object obj = limitCondition.getArg2().getValue(session);
+        	if ( obj != null )
+        	if (obj instanceof Integer)
+        		limitCount = ((Integer) limitCondition.getArg2().getValue(session)).intValue();
+        	else if (obj instanceof Long)
+        		limitCount = (int)((Long) limitCondition.getArg2().getValue(session)).longValue();
+        	else 
+        	{
+        		String strVal = obj.toString();
+        		limitCount = Integer.parseInt(strVal);
+        	}
         }
 
         if (rowCount != 0 && (limitCount == 0 || rowCount < limitCount)) {

data/platform/bb/Hsqldb/src/org/hsqldb/Session.java

@@ -163,13 +163,30 @@ public class Session implements SessionInterface {
     //RHO
     private IDBCallback m_dbCallback;
     public interface IDBCallback {
-    	public void onDeleteRow(Table table, Row row);
-    	public void onInsertRow(Table table, Row row);
+    	public void onAfterInsert(Table table, Row row);
+    	public void onBeforeUpdate(Table table, Row row, int[] cols);
+    	public void onBeforeDelete(Table table, Row row);
     };
     
     public void setDBCallback(IDBCallback callback){
     	m_dbCallback = callback;
     }
+    
+    public void onAfterInsert(Table table, Row row)
+    {
+    	if ( m_dbCallback != null )
+    		m_dbCallback.onAfterInsert(table, row);
+    }
+    public void onBeforeUpdate(Table table, Row row, int[] cols)
+    {
+    	if ( m_dbCallback != null )
+    		m_dbCallback.onBeforeUpdate(table, row, cols);
+    }
+    public void onBeforeDelete(Table table, Row row)
+    {
+    	if ( m_dbCallback != null )
+    		m_dbCallback.onBeforeDelete(table, row);
+    }
     //RHO
     /**
      * Constructs a new Session object.
@@ -419,8 +436,6 @@ public class Session implements SessionInterface {
      */
     public boolean addDeleteAction(Table table, Row row) throws HsqlException {
     	m_bNeedCommit = true;//!isNestedTransaction;
-    	if ( m_dbCallback != null )
-    		m_dbCallback.onDeleteRow(table, row);
     	
         if (!isAutoCommit || isNestedTransaction) {
             Transaction t = new Transaction(true, table, row, actionTimestamp);
@@ -457,18 +472,10 @@ public class Session implements SessionInterface {
 	            database.txManager.addTransaction(this, t);
         	}
 
-        	if ( m_dbCallback != null )
-        		m_dbCallback.onInsertRow(table, row);
-        	
             return true;
         } else {
             table.commitRowToStore(row);
-            
-        	if ( m_dbCallback != null )
-        		m_dbCallback.onInsertRow(table, row);
-            
         }
-
         
         return false;
     }

data/platform/bb/Hsqldb/src/org/hsqldb/Table.java

@@ -1892,15 +1892,16 @@ public class Table extends BaseTable {
         if (triggerLists[Trigger.INSERT_BEFORE_ROW] != null) {
             fireAll(session, Trigger.INSERT_BEFORE_ROW, null, data);
         }
-
+        
         setIdentityColumn(session, data);
         checkRowDataInsert(session, data);
-        insertNoCheck(session, data);
+        Row row = insertNoCheck(session, data);
 
         if (triggerLists[Trigger.INSERT_AFTER_ROW] != null) {
             fireAll(session, Trigger.INSERT_AFTER_ROW, null, data);
             checkRowDataInsert(session, data);
         }
+        session.onAfterInsert(this, row);
     }
 
     /**
@@ -1932,7 +1933,7 @@ public class Table extends BaseTable {
      *  UNIQUE or PRIMARY constraints are enforced by attempting to
      *  add the row to the indexes.
      */
-    private void insertNoCheck(Session session,
+    private Row insertNoCheck(Session session,
                                Object[] data) throws HsqlException {
 
         Row row = newRow(data);
@@ -1947,6 +1948,8 @@ public class Table extends BaseTable {
         if (isLogged) {
             database.logger.writeInsertStatement(session, this, data);
         }
+        
+        return row;
     }
 
     /**
@@ -2795,6 +2798,8 @@ public class Table extends BaseTable {
         Object[] data = row.getData();
 
         fireAll(session, Trigger.DELETE_BEFORE_ROW, data, null);
+        session.onBeforeDelete(this, row);
+        
         deleteNoCheck(session, row, true);
 
         // fire the delete after statement trigger
@@ -3081,7 +3086,8 @@ public class Table extends BaseTable {
                         data);
                 checkRowDataUpdate(session, data, cols);
             }
-
+            session.onBeforeUpdate(this, row, cols);
+            
             insertNoCheck(session, data);
 
             if (triggerLists[Trigger.UPDATE_AFTER_ROW] != null) {

data/platform/bb/Hsqldb/src/org/hsqldb/Token.java

@@ -819,9 +819,17 @@ public class Token {
             Token.T_EXTRACT, Token.T_FOR, Token.T_FROM, Token.T_GROUP,
             Token.T_HAVING, Token.T_IF, Token.T_INTO, Token.T_IFNULL,
             Token.T_IS, Token.T_IN, Token.T_INTERSECT, Token.T_JOIN,
-            Token.T_INNER, Token.T_LEADING, Token.T_LIKE, Token.T_MAX,
+            Token.T_INNER, Token.T_LEADING, Token.T_LIKE,
+            //RHO
+            Token.T_LIMIT,
+            //RHO
+            Token.T_MAX,
             Token.T_MIN, Token.T_NEXT, Token.T_NULLIF, Token.T_NOT,
-            Token.T_NVL, Token.T_MINUS, Token.T_ON, Token.T_ORDER, Token.T_OR,
+            Token.T_NVL, Token.T_MINUS,
+            //RHO
+            Token.T_OFFSET,
+            //RHO
+            Token.T_ON, Token.T_ORDER, Token.T_OR,
             Token.T_OUTER, Token.T_POSITION, Token.T_PRIMARY, Token.T_SELECT,
             Token.T_SET, Token.T_SOME, Token.T_STDDEV_POP, Token.T_STDDEV_SAMP,
             Token.T_SUBSTRING, Token.T_SUM, Token.T_THEN, Token.T_TO,

data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java

@@ -128,6 +128,7 @@ public class Tokenizer {
     private int              beginIndex;
     private int              iType;
     private String           sToken;
+    public  String           sTokenOrig;
     private int              indexLongNameFirst = -1;
     private String           sLongNameFirst = null;
     private int              typeLongNameFirst;
@@ -955,9 +956,8 @@ public class Tokenizer {
                     }
 
                     // fredt - todo new char[] to back sToken
-                    sToken =
-                        sCommand.substring(start,
-                                           iIndex).toUpperCase();//Locale.ENGLISH);
+                    sTokenOrig = sCommand.substring(start, iIndex);
+                    sToken = sTokenOrig.toUpperCase();//Locale.ENGLISH);
 
                     // the following only for NAME, not for NAMED_PARAM
                     if (iType == NAMED_PARAM) {

data/platform/bb/Hsqldb/src/org/hsqldb/lib/java/JavaSystem.java

@@ -44,7 +44,7 @@ import j2me.math.BigInteger;
 //import java.util.Properties;
 import java.util.Hashtable;
 //import j2me.text.Collator;
-import com.rho.db.RandomAccessFile;
+import com.rho.file.RandomAccessFile;
 import java.io.InputStream;
 
 import org.hsqldb.lib.FileAccess;

data/platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlProperties.java

@@ -152,7 +152,8 @@ public class HsqlProperties {
         boolean badvalue = false;
 
         try {
-            defaultValue = Integer.parseInt(prop);
+        	if ( prop != null )
+        		defaultValue = Integer.parseInt(prop);
         } catch (NumberFormatException e) {}
 
         if (defaultValue < minimum) {

data/platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFile.java

@@ -39,7 +39,7 @@ import com.rho.RhoEmptyLogger;
 import com.rho.RhoEmptyProfiler;
 import com.rho.RhoLogger;
 import com.rho.RhoProfiler;
-import com.rho.db.RandomAccessFile;
+import com.rho.file.RandomAccessFile;
 //import java.lang.reflect.Constructor;
 
 import org.hsqldb.Database;