Merge pull request #685 from cschabl/enhancement-676

Igor Polevoy · web-flow · commit cd5da047af5e · 2018-03-18T07:58:56.000-05:00
#676 Make @many2many repeatable
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/Registry.java b/activejdbc/src/main/java/org/javalite/activejdbc/Registry.java
@@ -257,6 +257,13 @@ private void processOverrides(List<Class<? extends Model>> models) {
             HasMany hasManyAnnotation = modelClass.getAnnotation(HasMany.class);
             processOverridesHasMany(modelClass, hasManyAnnotation);
 
+            Many2Manies many2ManiesAnnotation = modelClass.getAnnotation(Many2Manies.class);
+            if (many2ManiesAnnotation != null) {
+                for (Many2Many many2Many : many2ManiesAnnotation.value()) {
+                    processManyToManyOverrides(many2Many, modelClass);
+                }
+            }
+
             Many2Many many2manyAnnotation = modelClass.getAnnotation(Many2Many.class);
             if(many2manyAnnotation != null){
                 processManyToManyOverrides(many2manyAnnotation, modelClass);
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/annotations/Many2Manies.java b/activejdbc/src/main/java/org/javalite/activejdbc/annotations/Many2Manies.java
@@ -0,0 +1,16 @@
+package org.javalite.activejdbc.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Christof Schablinski
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Many2Manies
+{
+  Many2Many[] value();
+}
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/annotations/Many2Many.java b/activejdbc/src/main/java/org/javalite/activejdbc/annotations/Many2Many.java
@@ -20,6 +20,7 @@
 import org.javalite.activejdbc.Model;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -32,6 +33,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Repeatable(Many2Manies.class)
 //TODO: rename to ManyToMany?
 public @interface Many2Many {
     /**
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/IncludesTest.java b/activejdbc/src/test/java/org/javalite/activejdbc/IncludesTest.java
@@ -173,6 +173,26 @@ public void shouldIncludeMany2ManyInCaseJoinTableHasUnconventionalPKName() {
         a(recipe1).shouldBeTheSameAs(recipe2);
     }
 
+    @Test
+    public void shouldIncludeMultipleMany2ManyOverridesOnOneModel() {
+        Genre hardRock = Genre.createIt("name", "Hard rock");
+        Genre garageRock = Genre.createIt("name", "Garage rock");
+        Musician dankoJonesHimself = Musician.createIt("first_name", "Danko", "last_name", "Jones");
+        Musician johnCalabrese = Musician.createIt("first_name", "John", "last_name", "Calabrese");
+        Band dankoJones = Band.createIt("name", "Danko Jones");
+
+        dankoJones.add(hardRock);
+        dankoJones.add(garageRock);
+        dankoJones.add(dankoJonesHimself);
+        dankoJones.add(johnCalabrese);
+
+        List<Band> bands = Band.findAll().include(Genre.class, Musician.class);
+        List<Genre> genres = bands.get(0).getAll(Genre.class);
+        a(genres.size()).shouldBeEqual(2);
+        List<Musician> musicians = bands.get(0).getAll(Musician.class);
+        a(musicians.size()).shouldBeEqual(2);
+    }
+
     @Test
     public void shouldFixDefect163NeedsToIncludeChildrenAndParentsInTreeStructure(){
         Node car = new Node("Car");
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/DB2StatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/DB2StatementProvider.java
@@ -198,6 +198,16 @@ public List<String> getPopulateStatements(String table) {
               "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2)",
               "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2)"
           );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         } else {
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/H2StatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/H2StatementProvider.java
@@ -197,8 +197,17 @@ public List<String> getPopulateStatements(String table) {
               "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2);",
               "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2);"
           );
-        }
-        else {
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
+        } else {
             statements = Arrays.asList();
         }
 
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/MSSQLStatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/MSSQLStatementProvider.java
@@ -196,6 +196,16 @@ public List<String> getPopulateStatements(String table) {
                 "INSERT INTO players (id, first_name, last_name, team_id) VALUES (3, 'Nick', 'Foles', 2);",
                 "INSERT INTO players (id, first_name, last_name, team_id) VALUES (4, 'Trey', 'Burton', 2);"
             );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         } else{
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/MySQLStatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/MySQLStatementProvider.java
@@ -214,6 +214,16 @@ public List<String> getPopulateStatements(String table) {
                 "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2);",
                 "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2);"
             );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         }else{
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/OracleStatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/OracleStatementProvider.java
@@ -193,6 +193,16 @@ public List<String> getPopulateStatements(String table) {
                 "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2)",
                 "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2)"
             );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         } else{
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/PostgreSQLStatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/PostgreSQLStatementProvider.java
@@ -194,6 +194,16 @@ public List<String> getPopulateStatements(String table) {
                 "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2);",
                 "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2);"
             );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         } else {
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/SQLiteStatementProvider.java b/activejdbc/src/test/java/org/javalite/activejdbc/statement_providers/SQLiteStatementProvider.java
@@ -213,6 +213,16 @@ public List<String> getPopulateStatements(String table) {
                 "INSERT INTO players VALUES (3, 'Nick', 'Foles', 2);",
                 "INSERT INTO players VALUES (4, 'Trey', 'Burton', 2);"
             );
+        } else if (table.equals("bands")) {
+            statements = Arrays.asList();
+        } else if (table.equals("genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("musicians")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_genres")) {
+            statements = Arrays.asList();
+        } else if (table.equals("bands_musicians")) {
+            statements = Arrays.asList();
         }else{
             statements = Arrays.asList();
         }
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Band.java b/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Band.java
@@ -0,0 +1,17 @@
+package org.javalite.activejdbc.test_models;
+
+import org.javalite.activejdbc.Model;
+import org.javalite.activejdbc.annotations.IdName;
+import org.javalite.activejdbc.annotations.Many2Many;
+
+/**
+ * @author Christof Schablinski
+ */
+@Many2Many(other=Genre.class,
+    join = "bands_genres", sourceFKName = "band_id", targetFKName = "genre_id")
+@Many2Many(other=Musician.class,
+    join = "bands_musicians", sourceFKName = "band_id", targetFKName = "musician_id")
+@IdName("band_id")
+public class Band extends Model
+{
+}
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Genre.java b/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Genre.java
@@ -0,0 +1,12 @@
+package org.javalite.activejdbc.test_models;
+
+import org.javalite.activejdbc.Model;
+import org.javalite.activejdbc.annotations.IdName;
+
+/**
+ * @author Christof Schablinski
+ */
+@IdName("genre_id")
+public class Genre extends Model
+{
+}
diff --git a/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Musician.java b/activejdbc/src/test/java/org/javalite/activejdbc/test_models/Musician.java
@@ -0,0 +1,12 @@
+package org.javalite.activejdbc.test_models;
+
+import org.javalite.activejdbc.Model;
+import org.javalite.activejdbc.annotations.IdName;
+
+/**
+ * @author Christof Schablinski
+ */
+@IdName("musician_id")
+public class Musician extends Model
+{
+}
diff --git a/activejdbc/src/test/resources/db2_schema.sql b/activejdbc/src/test/resources/db2_schema.sql
@@ -191,8 +191,17 @@ CREATE TABLE boxes (id int primary key GENERATED ALWAYS AS IDENTITY, "color" VAR
 CALL dropTable('passengers');
 CREATE TABLE passengers (id int primary key GENERATED ALWAYS AS IDENTITY, user_id INT NOT NULL, vehicle VARCHAR(10),mode VARCHAR(10));
 
-CALL dropTable('teams');
-CREATE TABLE teams (team_id int primary key GENERATED ALWAYS AS IDENTITY, name VARCHAR(56) NOT NULL);
+CALL dropTable('bands');
+CREATE TABLE bands (band_id int primary key GENERATED ALWAYS AS IDENTITY, name VARCHAR(56) NOT NULL);
 
-CALL dropTable('players');
-CREATE TABLE players (id int primary key GENERATED ALWAYS AS IDENTITY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL, team_id INT);
+CALL dropTable('genres');
+CREATE TABLE genres (genre_id int primary key GENERATED ALWAYS AS IDENTITY, name VARCHAR(56) NOT NULL);
+
+CALL dropTable('musicians');
+CREATE TABLE musicians (musician_id int primary key GENERATED ALWAYS AS IDENTITY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL);
+
+CALL dropTable('bands_genres');
+CREATE TABLE bands_genres (the_id  int primary key GENERATED ALWAYS AS IDENTITY, band_id int, genre_id);
+
+CALL dropTable('bands_musicians');
+CREATE TABLE bands_musicians (the_id  int primary key GENERATED ALWAYS AS IDENTITY, band_id int, musician_id);
diff --git a/activejdbc/src/test/resources/h2_schema.sql b/activejdbc/src/test/resources/h2_schema.sql
@@ -150,7 +150,6 @@ CREATE TABLE recipes (recipe_id  int(11) NOT NULL  auto_increment PRIMARY KEY, r
 DROP TABLE IF EXISTS ingredients_recipes;
 CREATE TABLE ingredients_recipes (the_id  int(11) NOT NULL  auto_increment PRIMARY KEY, recipe_id int(11), ingredient_id int(11));
 
-
 DROP TABLE IF EXISTS vehicles;
 CREATE TABLE vehicles (id  int(11) NOT NULL  auto_increment PRIMARY KEY, name VARCHAR(56));
 
@@ -209,3 +208,18 @@ CREATE TABLE teams (team_id int(11) NOT NULL auto_increment PRIMARY KEY, name VA
 
 DROP TABLE IF EXISTS players;
 CREATE TABLE players (id int(11) NOT NULL auto_increment PRIMARY KEY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL, team_id int(11));
+
+DROP TABLE IF EXISTS bands;
+CREATE TABLE bands (band_id int(11) NOT NULL auto_increment PRIMARY KEY, name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS genres;
+CREATE TABLE genres (genre_id int(11) NOT NULL auto_increment PRIMARY KEY, name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS musicians;
+CREATE TABLE musicians (musician_id int(11) NOT NULL auto_increment PRIMARY KEY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS bands_genres;
+CREATE TABLE bands_genres (the_id  int(11) NOT NULL  auto_increment PRIMARY KEY, band_id int(11), genre_id int(11));
+
+DROP TABLE IF EXISTS bands_musicians;
+CREATE TABLE bands_musicians (the_id  int(11) NOT NULL  auto_increment PRIMARY KEY, band_id int(11), musician_id int(11));
diff --git a/activejdbc/src/test/resources/mssql_schema.sql b/activejdbc/src/test/resources/mssql_schema.sql
@@ -408,14 +408,33 @@ BEGIN
 END
 CREATE TABLE passengers (id INT IDENTITY PRIMARY KEY, user_id INT NOT NULL, vehicle VARCHAR(10), mode VARCHAR(10));
 
-IF object_id('dbo.teams') IS NOT NULL
-    BEGIN
-        DROP TABLE [dbo].[teams]
-    END
-CREATE TABLE teams (team_id INT IDENTITY PRIMARY KEY, name VARCHAR(56) NOT NULL);
 
-IF object_id('dbo.players') IS NOT NULL
-    BEGIN
-        DROP TABLE [dbo].[players]
-    END
-CREATE TABLE players (id INT IDENTITY PRIMARY KEY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL, team_id INT);
+IF object_id('dbo.bands') IS NOT NULL
+BEGIN
+    DROP TABLE [dbo].[bands]
+END
+CREATE TABLE bands (band_id INT IDENTITY PRIMARY KEY, name VARCHAR(10) NOT NULL);
+
+IF object_id('dbo.genres') IS NOT NULL
+  BEGIN
+    DROP TABLE [dbo].[genres]
+  END
+CREATE TABLE genres (genre_id INT IDENTITY PRIMARY KEY, name VARCHAR(10) NOT NULL);
+
+IF object_id('dbo.musicians') IS NOT NULL
+  BEGIN
+    DROP TABLE [dbo].[musicians]
+  END
+CREATE TABLE musicians (musician_id INT IDENTITY PRIMARY KEY, first_name VARCHAR(10) NOT NULL, last_name VARCHAR(10) NOT NULL);
+
+IF object_id('dbo.bands_genres') IS NOT NULL
+  BEGIN
+    DROP TABLE [dbo].[bands_genres]
+  END
+CREATE TABLE bands_genres (the_id INT IDENTITY PRIMARY KEY, band_id INT, genre_id INT);
+
+IF object_id('dbo.bands_musicians') IS NOT NULL
+  BEGIN
+    DROP TABLE [dbo].bands_musicians
+  END
+CREATE TABLE bands_musicians (the_id INT IDENTITY PRIMARY KEY, band_id INT, musician_id INT);
diff --git a/activejdbc/src/test/resources/mysql_schema.sql b/activejdbc/src/test/resources/mysql_schema.sql
@@ -207,8 +207,18 @@ CREATE TABLE boxes (id  int(11) NOT NULL auto_increment PRIMARY KEY, color VARCH
 DROP TABLE IF EXISTS passengers;
 CREATE TABLE passengers (id  int(11) NOT NULL auto_increment PRIMARY KEY, user_id INT(11) NOT NULL, vehicle VARCHAR(10), mode VARCHAR(10), created_at DATETIME, updated_at DATETIME) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-DROP TABLE IF EXISTS teams;
-CREATE TABLE teams (team_id int(11) NOT NULL auto_increment PRIMARY KEY, name VARCHAR(56) NOT NULL);
 
-DROP TABLE IF EXISTS players;
-CREATE TABLE players (id int(11) NOT NULL auto_increment PRIMARY KEY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL, team_id int(11));
+DROP TABLE IF EXISTS bands;
+CREATE TABLE bands (band_id int(11) NOT NULL auto_increment PRIMARY KEY, name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS genres;
+CREATE TABLE genres (genre_id int(11) NOT NULL auto_increment PRIMARY KEY, name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS musicians;
+CREATE TABLE musicians (musician_id int(11) NOT NULL auto_increment PRIMARY KEY, first_name VARCHAR(56) NOT NULL, last_name VARCHAR(56) NOT NULL);
+
+DROP TABLE IF EXISTS bands_genres;
+CREATE TABLE bands_genres (the_id  int(11) NOT NULL  auto_increment PRIMARY KEY, band_id int(11), genre_id int(11));
+
+DROP TABLE IF EXISTS bands_musicians;
+CREATE TABLE bands_musicians (the_id  int(11) NOT NULL  auto_increment PRIMARY KEY, band_id int(11), musician_id int(11));
diff --git a/activejdbc/src/test/resources/oracle_schema.sql b/activejdbc/src/test/resources/oracle_schema.sql
diff --git a/activejdbc/src/test/resources/postgres_schema.sql b/activejdbc/src/test/resources/postgres_schema.sql
diff --git a/activejdbc/src/test/resources/sqlite_schema.sql b/activejdbc/src/test/resources/sqlite_schema.sql
