Merge branch 'hotfix/0.5.3'

CHANGELOG.md

 # REAL changelog
 
+## Version [0.5.3](https://git.ecdf.ed.ac.uk/pguaglia/real/tags/0.5.3) (2021-10-21)
+
+#### Bug fixes
+
+- Fixed a bug in the implementation of intersection (issue #11).
+
 ## Version [0.5.2](https://git.ecdf.ed.ac.uk/pguaglia/real/tags/0.5.2) (2021-10-08)
 
 #### Bug fixes

pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>uk.ac.ed.pguaglia</groupId>
 	<artifactId>real</artifactId>
-	<version>0.5.2</version>
+	<version>0.5.3</version>
 	<name>real</name>
 	<url>https://git.ecdf.ed.ac.uk/pguaglia/real</url>
 

src/main/java/uk/ac/ed/pguaglia/real/db/Table.java

@@ -210,7 +210,7 @@ public class Table {
 	public static Table intersectAll(Table t1, Table t2) {
 		RowComparator c = new RowComparator();
 		List<String[]> rec1 = t1.getRecords();
-		List<String[]> rec2 = t2.getRecords();
+		List<String[]> rec2 = t2.getRecords().stream().map(x -> permute(x,t2.attributes,t1.attributes)).collect(Collectors.toList());
 		rec1.sort(c);
 		rec2.sort(c);
 
@@ -231,7 +231,7 @@ public class Table {
 			}
 			if (cmp > 0) {
 				if (it2.hasNext()) {					
-					curr2 = permute(it2.next(),t2.attributes,t1.attributes);
+					curr2 = it2.next();
 				} else {
 					break;
 				}
@@ -239,7 +239,7 @@ public class Table {
 			if (cmp == 0) {
 				if (it1.hasNext() && it2.hasNext()) {					
 					curr1 = it1.next();
-					curr2 = permute(it2.next(),t2.attributes,t1.attributes);
+					curr2 = it2.next();
 				} else {
 					break;
 				}

src/main/resources/welcome.txt

 ┌──────────────────────────────────────────────────────────────────────────────┐
-│            REAL: an interpreter for Relational Algebra (v0.5.2)              │
+│            REAL: an interpreter for Relational Algebra (v0.5.3)              │
 │                        Released under the MIT License                        │
 │                    Copyright © 2019-2021 Paolo Guagliardo                    │
 └──────────────────────────────────────────────────────────────────────────────┘