Projects >> nuxeo >>c8a13a1415b5d87fd9c978e824d305c0a3e0d891

Chunk
Conflicting content 
            ps = connection.prepareStatement(select.sql);
            if (whereIds instanceof String[]) {
<<<<<<< HEAD
            Column what = select.whatColumns.get(0);
                Array array = sqlInfo.dialect.createArrayOf(Types.OTHER,
=======
                Array array = dialect.createArrayOf(Types.VARCHAR,
>>>>>>> ac3ceba270b19ac9a0fc071194699090ae3d9d4c
                        (Object[]) whereIds, connection);
                ps.setArray(1, array);
            } else {
Solution content 
            Column what = select.whatColumns.get(0);
            ps = connection.prepareStatement(select.sql);
            if (whereIds instanceof String[]) {
                Array array = dialect.createArrayOf(Types.OTHER,
                        (Object[]) whereIds, connection);
                ps.setArray(1, array);
            } else {
File
JDBCMapper.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable