Removed unnecessary user relation from TagHub

code/HopObject/HopObject.js

@@ -324,7 +324,7 @@ HopObject.prototype.setTags = function(tags) {
       // Do nothing (tag already exists)
       break;
       case 1:
-      // Add tag to story
+      // Add tag
       this.addTag(tag);
       break;
       default:
@@ -340,7 +340,7 @@ HopObject.prototype.setTags = function(tags) {
  * @param {String} name
  */
 HopObject.prototype.addTag = function(name) {
-  TagHub.add(name, this, session.user);
+  TagHub.add(name, this);
   return;
 }
 

code/TagHub/TagHub.js

@@ -22,10 +22,9 @@
 /**
  * @param {String} name
  * @param {Story|Image} tagged
- * @param {User} user
  * @returns {TagHub}
  */
-TagHub.add = function(name, tagged, user) {
+TagHub.add = function(name, tagged) {
   HopObject.confirmConstructor(this);
   var hub = new TagHub;
   var site = tagged.site || res.handlers.site;
@@ -35,7 +34,6 @@ TagHub.add = function(name, tagged, user) {
   }
   hub.tag = tag;
   hub.tagged = tagged;
-  hub.user = user;
   tagged.tags.add(hub);
   return hub;
 }
@@ -48,7 +46,6 @@ TagHub.add = function(name, tagged, user) {
  * @property {Story|Image} tagged
  * @property {Number} tagged_id
  * @property {String} tagged_type
- * @property {User} user
  * @extends HopObject
  */
 TagHub.prototype.constructor = function() {

code/TagHub/TagHub.properties

@@ -35,7 +35,3 @@ tagged.local.1 = tagged_id
 tagged.foreign.1 = $id
 tagged.local.2 = tagged_type
 tagged.foreign.2 = $prototype
-
-user = object(User)
-user.local = user_id
-user.foreign = id

db/my.sql

@@ -226,7 +226,6 @@ create table tag_hub (
   tag_id int(10) unsigned,
   tagged_id int(10) unsigned,
   tagged_type varchar(20),
-  user_id int(10) unsigned,
   primary key  (id),
   key tagged (tag_id,tagged_type,tagged_id)
 );

db/postgre.sql

@@ -253,8 +253,7 @@ create table antville.tag_hub (
   id int4 primary key,
   tag_id int4,
   tagged_id int4,
-  tagged_type varchar(20),
-  user_id int4
+  tagged_type varchar(20)
 );
 
 create index tagged_idx on antville.tag_hub (tag_id, tagged_id, tagged_type);

extra/updater/patch-20141214.js

@@ -0,0 +1,26 @@
+// The Antville Project
+// http://code.google.com/p/antville
+//
+// Copyright 2001–2014 by the Workers of Antville.
+//
+// Licensed under the Apache License, Version 2.0 (the ``License'');
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ``AS IS'' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Apply with enabled updater repository using `ant patch -Dpatch.id=20141214`
+
+// Remove user relation from tag_hub
+// The database user needs “alter” permission for the table to apply this patch.
+// Afterwards user permissions should be restored.
+
+var sql = new Sql();
+
+sql.execute('alter table tag_hub drop column user_id');