TRUNK-3853 and TRUNK-3414

vinayvenu · Dec 24, 2012 · a1230a7 · a1230a7
1 parent 08278ec
commit a1230a7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/api/src/main/resources/liquibase-update-to-latest.xml b/api/src/main/resources/liquibase-update-to-latest.xml
@@ -5970,20 +5970,21 @@
      	<validCheckSum><comment>Changing now() to CURRENT_TIMESTAMP</comment>3:a70d8897d05364a0a4398f2b90542fd4</validCheckSum>
      	<validCheckSum><comment>Copying user.retired to person.voided so that generated providers for retired users are retired</comment>3:f338c9ea12ce38b0695db335d983b4e1</validCheckSum>
      	<validCheckSum><comment>Correcting checksum</comment>3:216ab5057dca5471de69124e93953d96</validCheckSum>
+     	<validCheckSum><comment>TRUNK-3853 and TRUNK-3414</comment>3:04bc8aa9859f6f8dda065e272ba12e0d</validCheckSum>
      	<preConditions onFail="MARK_RAN">
  			<columnExists tableName="encounter" columnName="provider_id"/>
  		</preConditions>
  		<comment>Creating providers for persons from the encounter table</comment>
  		<sql>
- 			insert into provider(person_id, identifier, creator, date_created, retired, retired_by, date_retired, retire_reason, uuid)
- 				select distinct person.person_id, person.uuid, 1, CURRENT_TIMESTAMP, user.retired, user.retired_by, user.date_retired, user.retire_reason, person.uuid 
+ 			insert into provider(person_id, identifier, creator, date_created, retired, uuid)
+ 				select distinct person.person_id, CONCAT('prov', SUBSTRING(person.uuid, 5)), 1, CURRENT_TIMESTAMP, false, CONCAT('prov', SUBSTRING(person.uuid, 5)) 
  				from person as person
  					inner join encounter as encounter on encounter.provider_id = person.person_id
  					left join users as user on user.person_id = person.person_id
  				where user.person_id is null and encounter.provider_id not in (select person_id from provider);
 
  			insert into provider(person_id, identifier, creator, date_created, retired, retired_by, date_retired, retire_reason, uuid)
- 				select distinct person.person_id, user.system_id, 1, CURRENT_TIMESTAMP, user.retired, user.retired_by, user.date_retired, user.retire_reason, person.uuid
+ 				select distinct person.person_id, user.system_id, 1, CURRENT_TIMESTAMP, user.retired, user.retired_by, user.date_retired, user.retire_reason, CONCAT('prov', SUBSTRING(person.uuid, 5))
  				from person as person
  					inner join encounter as encounter on encounter.provider_id = person.person_id
  					left join (select max(users.user_id) as user_id, users.system_id, users.person_id, users.retired, users.retired_by, users.date_retired, users.retire_reason