Mercurial > dive4elements > framework

comparison artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java @ 410:f456d9d55541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Read the account information from the database artifacts/trunk@5246 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Bjoern Ricks <bjoern.ricks@intevation.de>
date Thu, 23 Aug 2012 13:45:16 +0000
parents b7831cefbb62
children f5ecca16f601
comparison
equal deleted inserted replaced
409:4748949c4f19 410:f456d9d55541
807 } 807 }
808 808
809 809
810 public User createUser( 810 public User createUser(
811 final String name, 811 final String name,
812 final String account,
812 final Document role, 813 final Document role,
813 final UserFactory factory, 814 final UserFactory factory,
814 final Object context 815 final Object context
815 ) { 816 ) {
816 final User [] user = new User[1]; 817 final User [] user = new User[1];
836 prepareStatement(SQL_USERS_INSERT); 837 prepareStatement(SQL_USERS_INSERT);
837 838
838 stmnt.setInt(1, id); 839 stmnt.setInt(1, id);
839 stmnt.setString(2, identifier); 840 stmnt.setString(2, identifier);
840 stmnt.setString(3, name); 841 stmnt.setString(3, name);
842 stmnt.setString(4, account);
841 843
842 if (roleData == null) { 844 if (roleData == null) {
843 stmnt.setNull(4, Types.BIGINT); 845 stmnt.setNull(5, Types.BIGINT);
844 } 846 }
845 else { 847 else {
846 stmnt.setBytes(4, roleData); 848 stmnt.setBytes(5, roleData);
847 } 849 }
848 850
849 stmnt.execute(); 851 stmnt.execute();
850 conn.commit(); 852 conn.commit();
851 853
852 user[0] = factory.createUser( 854 user[0] = factory.createUser(
853 identifier, name, role, context); 855 identifier, name, account, role, context);
854 return true; 856 return true;
855 } 857 }
856 }; 858 };
857 859
858 boolean success = exec.runWrite(); 860 boolean success = exec.runWrite();
963 if (!result.next()) { // no such user 965 if (!result.next()) { // no such user
964 return false; 966 return false;
965 } 967 }
966 // omit id 968 // omit id
967 String name = result.getString(2); 969 String name = result.getString(2);
968 byte [] roleData = result.getBytes(3); 970 String account = result.getString(3);
971 byte [] roleData = result.getBytes(4);
969 972
970 Document role = XMLUtils.fromByteArray(roleData, true); 973 Document role = XMLUtils.fromByteArray(roleData, true);
971 974
972 user[0] = factory.createUser( 975 user[0] = factory.createUser(
973 identifier, name, role, context); 976 identifier, name, account, role, context);
974 return true; 977 return true;
975 } 978 }
976 }; 979 };
977 980
978 return exec.runRead() ? user[0] : null; 981 return exec.runRead() ? user[0] : null;
991 994
992 while (result.next()) { 995 while (result.next()) {
993 // omit id 996 // omit id
994 String identifier = result.getString(2); 997 String identifier = result.getString(2);
995 String name = result.getString(3); 998 String name = result.getString(3);
996 byte [] roleData = result.getBytes(4); 999 String account = result.getString(4);
1000 byte [] roleData = result.getBytes(5);
997 1001
998 Document role = XMLUtils.fromByteArray(roleData, true); 1002 Document role = XMLUtils.fromByteArray(roleData, true);
999 User user = factory.createUser( 1003 User user = factory.createUser(
1000 identifier, name, role, context); 1004 identifier, name, account, role, context);
1001 users.add(user); 1005 users.add(user);
1002 } 1006 }
1003 return true; 1007 return true;
1004 } 1008 }
1005 }; 1009 };
http://dive4elements.wald.intevation.org