rhodes 2.0.3 → 2.1.0

data/lib/framework/rhom/rhom_object_factory.rb

@@ -52,7 +52,7 @@ module Rhom
               def initialize(obj=nil)
                 @vars = {}
                 self.rhom_init(@vars)
-                self.vars[:object] = "#{generate_id()}"
+                self.vars[:object] = "#{generate_id()}" unless obj && obj[:object]
                 self.vars[:source_id] = self.get_inst_source_id.to_i
                 
                 if obj
@@ -61,34 +61,51 @@ module Rhom
                   end
                 end
               end
+
+              def object
+                @vars[:object]                
+              end
               
+              def source_id
+                @vars[:source_id]                
+              end
+
               def to_s
                   @vars.to_s if @vars
               end
               
+              def to_json(*args) 
+                @vars.to_json(*args) if @vars
+              end
+              
               def method_missing(name, *args)
                 unless name == Fixnum
-                  varname = name.to_s.gsub(/\=/,"")
-                  setting = (name.to_s =~ /=/)
-                  if setting
-                    @vars[varname.to_sym()] = args[0]  
+                  if name[name.length()-1] == '='
+                    @vars[name.to_s.chop.to_sym()] = args[0]  
                   else
-                    @vars[varname.to_sym()]
+                    @vars[name]
                   end
                 end
               end
-		  
+
+              @@metadata = {}
               class << self
 
+                def clean_cached_metadata
+                    src_name = get_source_name()
+                    @@metadata[src_name] = nil                    
+                end
+                
                 def metadata
-                  db = ::Rho::RHO.get_src_db(get_source_name)
-                  result = db.select_from_table('sources', 'metadata', {"name"=>get_source_name} )
+                  src_name = get_source_name()
+                  return @@metadata[src_name] if @@metadata[src_name]
+                  db = ::Rho::RHO.get_src_db(src_name)
+                  result = db.select_from_table('sources', 'metadata', {"name"=>src_name} )
                   if result && result.length > 0 && result[0]['metadata']
-                    return Rho::JSON.parse(result[0]['metadata'])
-                  else
-                    return nil
+                    @@metadata[src_name] = Rho::JSON.parse(result[0]['metadata'])
                   end
-
+                  
+                  @@metadata[src_name]
                 end
 
                 def count
@@ -117,6 +134,10 @@ module Rhom
                 def get_source_name
                   self.name.to_s
                 end
+
+                def is_sync_source
+                    Rho::RhoConfig.sources[get_source_name]['sync_type'] != 'none'
+                end
               
                 def is_schema_source
                     !Rho::RhoConfig.sources[get_source_name]['schema'].nil?
@@ -162,10 +183,12 @@ module Rhom
                     if key.is_a?(Hash)
                         bSimpleHash = false
 
+						val_op = "="
                         val_op = key[:op] if key[:op] 
                         val_func = key[:func] if key[:func] 
                         attrib_name = key[:name] if key[:name] 
-                        
+                        op = "AND" unless op
+						
                         condition_str += ' ' + op + ' ' if condition_str.length() > 0
                         if ( val_func && val_func.length() > 0 )
                             condition_str += val_func + "(\"" + attrib_name + "\")"
@@ -220,27 +243,61 @@ module Rhom
                     sql
                 end
 
+                def makeCondWhereEx(key,value,srcid_value)
+                    sql = ""
+
+					vals = []
+
+                    val_op = '='
+                    val_func = ''
+                    attrib_name = ''
+                    if key.is_a?(Hash)
+                        val_op = key[:op] if key[:op] 
+                        val_func = key[:func] if key[:func] 
+                        attrib_name = key[:name] if key[:name] 
+                    else
+                        attrib_name = key
+                    end
+                    
+                    sql << "attrib=?"
+					vals << attrib_name
+                    sql << " AND source_id=?"
+					vals << srcid_value					
+                    sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+                    
+                    if val_op == 'IN' or val_op == 'in'
+                        sql << val_op + " ( ? )"
+						vals << value.to_s						
+                    else
+                        sql << val_op + " ?"
+						vals << value.to_s
+                    end
+
+                    return sql, vals
+                end
+
                 def find_objects(condition_hash, op, limit, offset, order_attr)
                     nulls_cond = {}
                     if op == 'AND'
                         condition_hash.each do |key,value|
-                            if !value
+                            if value.nil?
                                 nulls_cond[key] = value
                                 condition_hash.delete(key)
                             end
                         end
                     end
                     
-                    srcid_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(get_source_id)
                     strLimit = nil
                     if !order_attr 
                         strLimit = " LIMIT " + limit.to_s + " OFFSET " + offset.to_s if limit && offset && condition_hash.length <= 1 && nulls_cond.length == 0
                     end
                     
-                    puts "non-null select start"
+                    #puts "non-null select start"
                     db = ::Rho::RHO.get_src_db(get_source_name)
                     listObjs = []
                     if op == 'OR' && condition_hash.length > 1
+                        srcid_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(get_source_id)
+					
                         mapObjs = {}
                         bStop = false 
                         condition_hash.each do |key,value|
@@ -263,23 +320,38 @@ module Rhom
                         end
                         
                     else
-                        sql = ""
                         if condition_hash.length > 0
+                            sql = ""
+						    vals = []
+                        
                             condition_hash.each do |key,value|
                                 sql << "\nINTERSECT\n" if sql.length > 0 
                                 sql << "SELECT object FROM object_values WHERE \n"
-                                sql << makeCondWhere(key,value,srcid_value)
+								
+                                sqlCond, valCond = makeCondWhereEx(key,value,get_source_id)
+								sql << sqlCond
+								vals = vals + valCond
+								
                                 sql << strLimit if strLimit
                             end
+                            
+                            listObjs = db.execute_sql(sql, vals)
+
                         else
-                            sql << "SELECT distinct object FROM object_values WHERE \n"
-                            sql << "source_id=" + srcid_value 
+                            sql = ""
+						    vals = []
+                        
+                            sql << "SELECT distinct( object ) FROM object_values WHERE \n"
+                            sql << "source_id=?"
+							vals << get_source_id
                             sql << strLimit if strLimit
+                            
+                            listObjs = db.execute_sql(sql, vals)
+                            
                         end
                                             
-                        listObjs = db.execute_sql(sql)
                     end
-                    puts "non-null select end : #{listObjs.length}"
+                    #puts "non-null select end : #{listObjs.length}"
                     
                     nIndex = -1
                     res = []
@@ -296,8 +368,7 @@ module Rhom
                             sql << " AND attrib=?" # + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(key)
                             sql << " AND source_id=?" # + srcid_value
 
-                            attrVal = db.execute_sql(sql, 
-                                obj['object'], key, get_source_id)
+                            attrVal = db.execute_sql(sql, obj['object'], key, get_source_id)
                             #puts 'attrVal: ' + attrVal.inspect  if attrVal
                             if attrVal && attrVal.length>0 && attrVal[0]['value']
                                 bSkip = true
@@ -352,7 +423,7 @@ module Rhom
                 end
                                 
                 def find_bycondhash(args, &block)                
-                    puts 'find_bycondhash start'
+                    #puts 'find_bycondhash start'
                     
                     condition_hash = {}
                     select_arr = nil
@@ -394,10 +465,10 @@ module Rhom
                       #attribs = SyncEngine.get_src_attrs(nSrcID)
                     end
 
-                    srcid_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(get_source_id)
+                    #srcid_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(get_source_id)
 
                     db = ::Rho::RHO.get_src_db(get_source_name)
-                    db.start_transaction
+                    db.lock_db
                     begin
                         listObjs = []
                         if condition_hash.is_a?(Hash)
@@ -417,40 +488,45 @@ module Rhom
                                 if attribs
                                     nonExistAttrs = attribs.dup
                                     nonExistAttrs.delete(obj['attrib']) if obj['attrib']
-                                    
-                                    nonExistAttrs.each do |attr|
-                                        sql << "\nUNION ALL\n" if sql.length > 0
-                                        sql << "SELECT attrib,value FROM object_values WHERE \n"
-                                        sql << "object=?" #+ obj_value
-                                        sql << " AND attrib=?" #+ ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(attr)
-                                        sql << " AND source_id=?" #+ srcid_value 
-                                        
+
+                                    if nonExistAttrs.length > 0
+                                        sql << "SELECT attrib,value FROM object_values WHERE object=? AND source_id=?"
                                         values << obj['object']
-                                        values << attr
                                         values << get_source_id
-                                    end
+                                        
+                                        quests = ""
+                                        nonExistAttrs.each do |attr|
+                                            quests << ',' if quests.length() > 0
+                                            quests << '?'
+                                            values << attr
+                                        end
+
+                                        sql << " AND attrib IN (#{quests})"
+                                    end                                    
                                 else
                                     sql << "SELECT attrib,value FROM object_values WHERE \n"
-                                    sql << "object=?"
-                                    sql << " AND source_id=?"
+                                    sql << "object=? AND source_id=?"
                                     
                                     values << obj['object']
                                     values << get_source_id
                                 end
                                 
+                                #puts "get attribs: #{sql}"
                                 listAttrs = sql.length > 0 ? db.execute_sql(sql,values) : []
-                                
-                                new_obj = self.new
-                                new_obj.vars.merge!({:object=>"#{obj['object']}"})
+								
+                                new_obj = self.new({:object=>"#{obj['object']}"})
+                                #new_obj.vars.merge!({:object=>"#{obj['object']}"})
                                 
                                 if attribs && obj['attrib']
-                                    new_obj.vars.merge!( {obj['attrib'].to_sym()=>obj['value'] }) if obj['value']
+                                    #new_obj.vars.merge!( {obj['attrib'].to_sym()=>obj['value'] }) if obj['value']
+									new_obj.vars[obj['attrib'].to_sym()] = obj['value'] if obj['value']
                                 end
                                 
                                 listAttrs.each do |attrValHash|
                                   attrName = attrValHash['attrib']
                                   attrVal = attrValHash['value']
-                                  new_obj.vars.merge!( { attrName.to_sym()=>attrVal } ) if attrVal
+                                  #new_obj.vars.merge!( { attrName.to_sym()=>attrVal } ) if attrVal
+								  new_obj.vars[attrName.to_sym()] = attrVal if attrVal
                                   
                                   #nonExistAttrs.delete(attrName) if nonExistAttrs
                                 end
@@ -466,7 +542,7 @@ module Rhom
                             end
                         end    
                     ensure
-                      db.commit
+                      db.unlock_db
                     end
                   
                     if order_attr
@@ -483,7 +559,7 @@ module Rhom
                         ret_list = ret_list.slice(offset,limit)
                     end
 
-                    puts "find_bycondhash end: #{ret_list.length} objects"
+                    #puts "find_bycondhash end: #{ret_list.length} objects"
 
                     return nCount if args.first == :count
 
@@ -499,7 +575,7 @@ module Rhom
                 def find(*args, &block)
                   raise ::Rhom::RecordNotFound if args[0].nil? or args.length == 0
 
-                  puts "Inside find: args - #{args.inspect}"
+                  #puts "Inside find: args - #{args.inspect}"
                   
                   ret_list = []
                   conditions = {}
@@ -576,35 +652,119 @@ module Rhom
                     attribs = select_arr
                     attribs = attribs | condition_hash.keys if condition_hash
                   else
-                    if !is_schema_source()
-                        attribs = SyncEngine.get_src_attrs(Rho::RhoConfig.sources[get_source_name]['partition'].to_s, nSrcID)
-                    else
-                        attribs = '*'
-                    end    
+                    attribs = '*'
                   end
 
                   if attribs and attribs.length > 0
                     sql = ""
+                    list = []
+                    db = ::Rho::RHO.get_src_db(get_source_name)
                     
-                    if !is_schema_source()                    
-                        sql << "SELECT * FROM (\n" if condition_hash or condition_str
-                        sql << "SELECT object, \n"
-                        #attribs.reject! {|attrib| select_arr.index(attrib).nil?} if select_arr
-                        attribs.each do |attrib|
-                          unless attrib.nil? or attrib.length == 0 or ::Rhom::RhomObject.method_name_reserved?(attrib)
-                            sql << "MAX(CASE WHEN attrib = '#{attrib}' THEN value ELSE NULL END) AS \'#{attrib}\',\n"
+                    if !is_schema_source()
+                      objects = nil
+                      if !condition_hash && !condition_str
+                        #srcid_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(get_source_id)
+                        values = [] 
+
+                        if args.first.is_a?(String)                      
+                          objects = [ { 'object' => strip_braces(args.first.to_s) } ]
+                          
+                        else  
+                          if !block_given? && order_attr
+                              if  !args[1][:dont_ignore_missed_attribs]
+                                  sql << "SELECT object FROM object_values WHERE source_id=? "
+                                  sql << " AND attrib=? ORDER BY \"value\" " + order_dir
+                                  values << get_source_id
+                                  values << order_attr
+                              end    
+                          else
+                              #it is more effective to use old find here
+                              if attribs && attribs != '*' && attribs.length() != 0 && !args[1][:dont_ignore_missed_attribs]
+                                  #sql << "SELECT object FROM object_values WHERE source_id=? AND attrib=?"
+                                  #values << get_source_id
+                                  #values << attribs[0]
+                              else 
+                                  #sql << "SELECT distinct(object) FROM object_values WHERE source_id=" << srcid_value 
+                              end    
                           end
-                        end 
-                        sql.chomp!
-                        sql.chop!
-                        sql << " FROM object_values ov \n"
-                        sql << "where " + ::Rhom::RhomDbAdapter.where_str(where_cond) + "\n" if where_cond and where_cond.length > 0
-                        sql << "group by object\n"
-                        sql << "order by \"#{order_attr}\" " + order_dir if !block_given? && order_attr
-                        #sql << ") WHERE " + ::Rhom::RhomDbAdapter.where_str(condition_hash) if condition_hash
-                        sql << ") WHERE " + condition_str if condition_str
-                        sql << strLimit if strLimit
-                    else
+                          
+                          if sql.length() > 0                          
+                            sql << strLimit if strLimit
+
+                            #puts "Database query start" # : #{sql}; #{values}"
+                            objects = db.execute_sql(sql, values)
+
+                            #puts "Database query end" #: #{objects}"
+                          end
+                                                  
+                        end
+                        
+                        if objects
+                            objects.each do |object|
+                                object_id = object['object']
+                                sql2 = "SELECT attrib,value FROM object_values WHERE object=? AND source_id=?"
+                                values2 = []
+                                values2 << object_id
+                                values2 << get_source_id
+                                
+                                if attribs && attribs != '*'    
+                                    quests = ""
+                                    attribs.each do |attr|
+                                        quests << ',' if quests.length() > 0
+                                        quests << '?'
+                                        values2 << attr
+                                    end
+
+                                    sql2 << " AND attrib IN (#{quests})"
+                                end                                    
+                               
+                                item_attribs = db.execute_sql(sql2, values2)
+                                if item_attribs && item_attribs.length() > 0
+                                    new_item = {'object'=>object_id }
+                                    item_attribs.each do |item|
+                                       new_item[item['attrib']] = item['value']
+                                    end    
+
+                                    list << new_item
+                                end    
+                            end    
+                         end
+						 
+                         #puts "Processing rhom objects end1, #{list.length} objects"
+                      end
+                            
+                      if objects.nil?
+                      
+                        if attribs == "*"
+                            attribs = SyncEngine.get_src_attrs(Rho::RhoConfig.sources[get_source_name]['partition'].to_s, nSrcID)                            
+                        end    
+                      
+                        if attribs and attribs.length > 0                      
+                            sql << "SELECT * FROM (\n" if condition_hash or condition_str
+                            sql << "SELECT object, \n"
+                            #attribs.reject! {|attrib| select_arr.index(attrib).nil?} if select_arr
+                            attribs.each do |attrib|
+                              unless attrib.nil? or attrib.length == 0 or ::Rhom::RhomObject.method_name_reserved?(attrib)
+                                sql << "MAX(CASE WHEN attrib = '#{attrib}' THEN value ELSE NULL END) AS \'#{attrib}\',\n"
+                              end
+                            end 
+                            sql.chomp!
+                            sql.chop!
+                            sql << " FROM object_values ov \n"
+                            sql << "where " + ::Rhom::RhomDbAdapter.where_str(where_cond) + "\n" if where_cond and where_cond.length > 0
+                            sql << "group by object\n"
+                            sql << "order by \"#{order_attr}\" " + order_dir if !block_given? && order_attr
+                            #sql << ") WHERE " + ::Rhom::RhomDbAdapter.where_str(condition_hash) if condition_hash
+                            sql << ") WHERE " + condition_str if condition_str
+                            sql << strLimit if strLimit
+                            
+                            puts "Database query start"
+                            list = db.execute_sql(sql)
+                            puts "Database query end"
+                        end   
+                      end  
+
+                    else #schema source
                        attribs = attribs.join(',') if attribs.is_a?(Array)
                        
                        sql << "SELECT #{attribs} FROM #{get_schema_table_name}"
@@ -617,20 +777,19 @@ module Rhom
                            
                        sql << " order by \"#{order_attr}\" " + order_dir if !block_given? && order_attr
                        sql << strLimit if strLimit
+                       
+                       puts "Database query start" #: #{sql}"
+                       list = db.execute_sql(sql)
+                       puts "Database query end"
+                       
                     end
                     
-                    puts "Database query start"
-                    
-                    db = ::Rho::RHO.get_src_db(get_source_name)
-                    list = db.execute_sql(sql)
-                    puts "Database query end"
-                    
                     if args.first != :count
                         list.each do |rowhash|
                           # always return object field with surrounding '{}'
-                          rowhash[:object] = "#{rowhash['object']}"
+                          #rowhash[:object] = "#{rowhash['object']}"
                           #rowhash[:source_id] = nSrcID
-                          new_obj = self.new
+                          new_obj = self.new({:object=>"#{rowhash['object']}"})
                           #new_obj.vars.merge!(rowhash)
                           
                           rowhash.each do |attrName, attrVal|
@@ -640,7 +799,7 @@ module Rhom
                           ret_list << new_obj
                         end
                         
-                        puts "Processing rhom objects end, #{ret_list.length} objects"
+                        #puts "Processing rhom objects end, #{ret_list.length} objects"
                     end
                   else
                       puts "Processing rhom objects end, no attributes found."
@@ -665,25 +824,9 @@ module Rhom
                 end
               
                 def search(args)
-                  searchParams = ""
-                  
-                  searchParams += '&offset=' + Rho::RhoSupport.url_encode(args[:offset]) if args[:offset]
-                  searchParams += '&max_results=' + Rho::RhoSupport.url_encode(args[:max_results]) if args[:max_results]
+                    args[:source_names] = [self.name.to_s]
 
-                  callbackParams = args[:callback_param] ? args[:callback_param] : ""
-                  
-                  if args[:search_params]
-                    args[:search_params].each do |key,value|
-                      searchParams += '&' + "conditions[#{Rho::RhoSupport.url_encode(key)}]" + '=' + Rho::RhoSupport.url_encode(value)
-                      callbackParams += '&' + "search_params[#{Rho::RhoSupport.url_encode(key)}]" + '=' + Rho::RhoSupport.url_encode(value)
-                    end  
-                  end
-                    
-                  #set_notification(args[:callback], args[:callback_param]) if args[:callback]
-                  src_ar = [self.name.to_s]
-                  SyncEngine.dosearch(src_ar, args[:from] ? args[:from] : 'search',
-                    searchParams, args[:sync_changes] ? args[:sync_changes] : false, args[:progress_step] ? args[:progress_step] : -1,
-                    args[:callback], callbackParams )
+                    SyncEngine.search(args)
                 end
 
                 def sync(callback=nil, callback_data="", show_status_popup=nil)
@@ -740,7 +883,7 @@ module Rhom
                         puts "del_objects : #{del_objects}"
                         del_objects.each do |obj|
                           db.delete_from_table(tableName, {'object'=>obj['object']})
-                          db.delete_from_table('changed_values', {'object'=>obj['object']})
+                          db.delete_from_table('changed_values', {'object'=>obj['object']}) if is_sync_source()
                         end
                       else
                         if is_schema_source()
@@ -749,7 +892,7 @@ module Rhom
                             db.delete_from_table(tableName, {"source_id"=>get_source_id})
                         end
                             
-                        db.delete_from_table('changed_values', {"source_id"=>get_source_id})
+                        db.delete_from_table('changed_values', {"source_id"=>get_source_id})  if is_sync_source()
                         #TODO: add delete all update_type
                       end
                       db.commit
@@ -762,6 +905,59 @@ module Rhom
                   end    
                       
                 end
+
+                # saves the current object to the database as a create type
+                def create(obj)  		      
+                    new_obj = self.new(obj)
+                    
+                    update_type = 'create'
+                    nSrcID = get_source_id
+                    obj = new_obj.object
+                    src_name = get_source_name
+                    db_partition = Rho::RhoConfig.sources[src_name]['partition'].to_s
+                    isSchemaSrc = is_schema_source()
+                    tableName = isSchemaSrc ? get_schema_table_name() : 'object_values'
+                    db = ::Rho::RHO.get_src_db(src_name)
+                    begin
+                        db.start_transaction
+
+                        if isSchemaSrc
+                            db.insert_into_table(tableName, new_obj.vars, {:source_id=>true})
+                        end
+                        
+                        if is_sync_source() || !isSchemaSrc
+                            new_obj.vars.each do |key_a,value|
+                                key = key_a.to_s
+                                next if ::Rhom::RhomObject.method_name_reserved?(key)
+
+                                val = value.to_s #self.inst_strip_braces(value.to_s)
+                                
+                                # add rows excluding object, source_id and update_type
+                                fields = {"source_id"=>nSrcID,
+                                          "object"=>obj,
+                                          "attrib"=>key,
+                                          "value"=>val,
+                                          "update_type"=>update_type}
+                                fields = new_obj.is_blob_attrib(db_partition, nSrcID, key) ? fields.merge!({"attrib_type" => "blob.file"}) : fields
+                                
+                                db.insert_into_table('changed_values', fields) if is_sync_source()
+                                fields.delete("update_type")
+                                fields.delete("attrib_type")
+                                
+                                db.insert_into_table(tableName, fields) if !isSchemaSrc
+                            end
+                        end
+                        
+                        db.commit
+                    rescue Exception => e
+                        puts 'create Exception: ' + e.inspect
+                        db.rollback
+                        
+                        raise    
+                    end
+                    
+                    new_obj    
+                end
                     
                 private
                 
@@ -777,6 +973,7 @@ module Rhom
                     nil
                   end
                 end
+                
               end #class methods
 	          
 	          # if app server does not support oo in inserts. 
@@ -805,7 +1002,6 @@ module Rhom
               # deletes the record from the viewable list as well as
               # adding a delete record to the list of sync operations
               def destroy
-			    puts "destroy: #{self}"
                 obj = self.object #self.inst_strip_braces(self.object)
                 update_type='delete'
                 
@@ -817,19 +1013,24 @@ module Rhom
                       db.start_transaction
                 
                       #save list of attrs
-                      attrsList = db.select_from_table(tableName, '*', {"object"=>obj}) 
+                      attrsList = nil
+                      if is_inst_schema_source()
+                        attrsList = db.select_from_table(tableName, '*', {"object"=>obj}) 
+                      else
+                        attrsList = db.select_from_table(tableName, '*', {"object"=>obj, "source_id"=>self.get_inst_source_id()}) 
+                      end  
                       
                       # first delete the record from viewable list
                       db.delete_from_table(tableName, {"object"=>obj})
                       
-                      resUpdateType = db.select_from_table('changed_values', 'update_type', {"object"=>obj, "update_type"=>'create', "sent"=>0}) 
+                      resUpdateType =  is_inst_sync_source() ? db.select_from_table('changed_values', 'update_type', {"object"=>obj, "update_type"=>'create', "sent"=>0}) : nil 
                       if resUpdateType && resUpdateType.length > 0 
                         update_type = nil                              
                       end
                       
-                      db.delete_from_table('changed_values', {"object"=>obj, "sent"=>0})
+                      db.delete_from_table('changed_values', {"object"=>obj, "sent"=>0}) if is_inst_sync_source()
                       
-                      if update_type and attrsList and attrsList.length() > 0
+                      if is_inst_sync_source() && update_type and attrsList and attrsList.length() > 0
                         # now add delete operation
                         if is_inst_schema_source()
                             attrsList[0].each do |attrName, attrValue|
@@ -867,7 +1068,7 @@ module Rhom
                 SyncEngine.is_blob_attr(db_partition, nSrcID.to_i,attrib_name)
 		        #return attrib_name == "image_uri"
 		      end
-		      
+
               # saves the current object to the database as a create type
               def save
                 # iterate over each instance variable and insert create row to table
@@ -879,22 +1080,25 @@ module Rhom
 				isSchemaSrc = is_inst_schema_source()
                 begin
                     db.start_transaction
-                    
-                    if isSchemaSrc
-                        result = db.execute_sql("SELECT object FROM #{tableName} WHERE object=? LIMIT 1 OFFSET 0",obj)
-                    else
-                        result = db.execute_sql("SELECT object FROM #{tableName} WHERE object=? AND source_id=? LIMIT 1 OFFSET 0",obj,nSrcID)
-                    end
 
-                    if result && result.length > 0                     
-                        resUpdateType = db.select_from_table('changed_values', 'update_type', {"object"=>obj, "source_id"=>nSrcID, 'sent'=>0}) 
-                        if resUpdateType && resUpdateType.length > 0 
-                            update_type = resUpdateType[0]['update_type'] 
+			        update_type = ''
+                    if is_inst_sync_source()
+                        if isSchemaSrc
+                            result = db.execute_sql("SELECT object FROM #{tableName} WHERE object=? LIMIT 1 OFFSET 0",obj)
                         else
-        				    update_type = 'update'
-        				end    
-    				else
-    				    update_type = 'create'
+                            result = db.execute_sql("SELECT object FROM #{tableName} WHERE object=? AND source_id=? LIMIT 1 OFFSET 0",obj,nSrcID)
+                        end
+
+                        if result && result.length > 0                     
+                            resUpdateType = is_inst_sync_source() ? db.select_from_table('changed_values', 'update_type', {"object"=>obj, "source_id"=>nSrcID, 'sent'=>0}) : nil
+                            if resUpdateType && resUpdateType.length > 0 
+                                update_type = resUpdateType[0]['update_type'] 
+                            else
+        				        update_type = 'update'
+        				    end    
+    				    else
+    				        update_type = 'create'
+    				    end
     				end
     				
                     self.vars.each do |key_a,value|
@@ -930,13 +1134,16 @@ module Rhom
                             
                             if isModified
                             
-                                resUpdateType = db.select_from_table('changed_values', 'update_type', {"object"=>obj, "attrib"=>key, "source_id"=>nSrcID, 'sent'=>0}) 
-                                if resUpdateType && resUpdateType.length > 0 
-                                    fields['update_type'] = resUpdateType[0]['update_type'] 
-                                    db.delete_from_table('changed_values', {"object"=>obj, "attrib"=>key, "source_id"=>nSrcID, "sent"=>0})
-                                end
+                                if is_inst_sync_source()
+                                    resUpdateType = db.select_from_table('changed_values', 'update_type', {"object"=>obj, "attrib"=>key, "source_id"=>nSrcID, 'sent'=>0}) 
+                                    if resUpdateType && resUpdateType.length > 0 
+                                        fields['update_type'] = resUpdateType[0]['update_type'] 
+                                        db.delete_from_table('changed_values', {"object"=>obj, "attrib"=>key, "source_id"=>nSrcID, "sent"=>0})
+                                    end
 
-                                db.insert_into_table('changed_values', fields)
+                                    db.insert_into_table('changed_values', fields)
+                                end
+                                    
                                 if isSchemaSrc
                                     db.update_into_table(tableName, {key=>val}, {"object"=>obj})
                                 else
@@ -944,7 +1151,7 @@ module Rhom
                                 end    
                             end    
                         else
-                            db.insert_into_table('changed_values', fields)
+                            db.insert_into_table('changed_values', fields) if is_inst_sync_source()
                             fields.delete("update_type")
                             fields.delete("attrib_type")
                             
@@ -999,7 +1206,7 @@ module Rhom
                       # then we procede with update
                       if isModified
                           # only one update at a time
-                          resUpdateType = db.select_from_table('changed_values', 'update_type', {"object"=>obj, "source_id"=>nSrcID, 'sent'=>0}) 
+                          resUpdateType = is_inst_sync_source() ? db.select_from_table('changed_values', 'update_type', {"object"=>obj, "source_id"=>nSrcID, 'sent'=>0}) : nil 
                           if resUpdateType && resUpdateType.length > 0 
                               update_type = resUpdateType[0]['update_type'] 
                               db.delete_from_table('changed_values', {"object"=>obj, "attrib"=>attrib, "source_id"=>nSrcID, "sent"=>0})
@@ -1026,13 +1233,15 @@ module Rhom
                               end    
                             
                           end
-                            
-                          if result && result.length > 0 
-                            db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>update_type})
-                          else
-                            db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>update_type})
-                          end    
                           
+                          if is_inst_sync_source()  
+                              if result && result.length > 0 
+                                db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>update_type})
+                              else
+                                db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>update_type})
+                              end    
+                          end
+                                                      
                           # update in-memory object
                           self.vars[attrib.to_sym()] = new_val
                       end
@@ -1058,6 +1267,10 @@ module Rhom
                 Rho::RhoConfig.sources[get_inst_source_name]['source_id'].to_s
               end
           
+              def is_inst_sync_source
+                  Rho::RhoConfig.sources[get_inst_source_name]['sync_type'] != 'none'
+              end
+          
               def is_inst_schema_source
                  !Rho::RhoConfig.sources[get_inst_source_name]['schema'].nil?
               end