Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Diff Revisions 153110 ... vs d7fd17 ... for ruralHouses/src/dataAccess/DB4oManager.java

Diff revisions: vs.
  @@ -81,6 +81,7 @@
81 81 configuration.common().activationDepth(c.getActivationDepth());
82 82 configuration.common().updateDepth(c.getUpdateDepth());
83 83 configuration.common().objectClass(Owner.class).cascadeOnUpdate(true);
84 + configuration.common().objectClass(Owner.class).cascadeOnDelete(true);
84 85 configuration.common().objectClass(RuralHouse.class).cascadeOnUpdate(true);
85 86 configuration.common().objectClass(Account.class).cascadeOnUpdate(true);
86 87 db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
  @@ -128,14 +129,12 @@
128 129
129 130 alfredo.addRuralHouse("Murgoitz", "", "Cedro", 6, 6, 6, 6, 6);
130 131 alfredo.setBankAccount("4144 0087 23 9700002133");
131 - Account jonAcc = new Account("userJon", "passJon", jon);
132 + Account jonAcc = new Account("1", "1", jon);
132 133 Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
133 134 alfredo);
134 135
135 136 Account admin = new Account("admin","admin", true);
136 137 db.store(Administrator.giveAdmin());
137 - db.store(jon);
138 - db.store(alfredo);
139 138 db.store(jonAcc);
140 139 db.store(alfredoAcc);
141 140 db.store(admin);
  @@ -464,12 +463,9 @@
464 463 ObjectSet<RuralHouse> result = db.queryByExample(house);
465 464 if (result.isEmpty()) {
466 465 Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
467 - ObjectSet<RuralHouse> orh = db.queryByExample(new RuralHouse(null, ow, null, null, null));
466 + rh.setOwner(ow);
468 467 ow.addRuralHouse(rh);
469 - for (RuralHouse aa: orh){
470 - aa.setOwner(ow);
471 - }
472 - db.store(ow);
468 + db.store(rh);
473 469 db.commit();
474 470 stored = true;
475 471 } else {