Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
08/06/08 17:17:55 (5 months ago)
Author:
mseaton
Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateContextDAO.java

    r4969 r5183  
    4747         * Hibernate session factory 
    4848         */ 
    49         public SessionFactory sessionFactory; 
     49        private SessionFactory sessionFactory; 
    5050 
    5151        /** 
    …… 
    259259                        Connection conn = sessionFactory.getCurrentSession().connection(); 
    260260 
    261                         psSelect = conn 
    262                                        .prepareStatement("SELECT * FROM role WHERE UPPER(role) = UPPER(?)"); 
     261                        // Ticket #900 - Made explicit reference to columns 
     262                        psSelect = conn.prepareStatement("SELECT role, description FROM role WHERE UPPER(role) = UPPER(?)"); 
    263263                        psInsert = conn.prepareStatement("INSERT INTO role (role, description) VALUES (?, ?)"); 
    264264 
    …… 
    283283                        Connection conn = sessionFactory.getCurrentSession().connection(); 
    284284 
     285                        // Ticket #900 - Made explicit reference to columns 
    285286                        psSelect = conn 
    286                                         .prepareStatement("SELECT * FROM privilege WHERE UPPER(privilege) = UPPER(?)"); 
     287                                        .prepareStatement("SELECT privilege, description FROM privilege WHERE UPPER(privilege) = UPPER(?)"); 
    287288                        psInsert = conn 
    288289                                        .prepareStatement("INSERT INTO privilege (privilege, description) VALUES (?, ?)"); 
    …… 
    308309                        Connection conn = sessionFactory.getCurrentSession().connection(); 
    309310 
     311                        // Ticket #900 - Made explicit reference to columns 
    310312                        psSelect = conn 
    311                                         .prepareStatement("SELECT * FROM global_property WHERE UPPER(property) = UPPER(?)"); 
     313                                        .prepareStatement("SELECT property, property_value, description FROM global_property WHERE UPPER(property) = UPPER(?)"); 
    312314                        psInsert = conn 
    313315                                        .prepareStatement("INSERT INTO global_property (property, property_value, description) VALUES (?, ?, ?)");