From b9519f5f0b825de7c22275033dd6e6daec1f2b23 Mon Sep 17 00:00:00 2001 From: Josh Starcher Date: Fri, 22 Mar 2013 09:27:16 +0700 Subject: [PATCH] Fix adding an index when a relationship is created --- server/module_api/sub_Object.js | 10 ++++------ server/module_api/sub_Relationship.js | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/server/module_api/sub_Object.js b/server/module_api/sub_Object.js index ca210ad..b752448 100644 --- a/server/module_api/sub_Object.js +++ b/server/module_api/sub_Object.js @@ -65,16 +65,16 @@ hrisObject.setup = function() { //// OK, make sure this object is cached for us: cachedObjects[object[Object.id]] = object.attrs(); - - + + // sql: // CREATE TABLE `hris2_attributes` ( // `attribute_id` int(11) unsigned NOT NULL AUTO_INCREMENT, // PRIMARY KEY (`attribute_id`) // ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - + var sql = AD.Util.String.render(sqlCommands.newTable, object.attrs()); - + // console.log('sql:'+sql); @@ -147,8 +147,6 @@ console.log('sql:'+sql); - //// 2: Remove any relationships referenced by/to this object - } else { /// Odd ... where did this reference come from? diff --git a/server/module_api/sub_Relationship.js b/server/module_api/sub_Relationship.js index dd3b616..6a209bb 100644 --- a/server/module_api/sub_Relationship.js +++ b/server/module_api/sub_Relationship.js @@ -81,10 +81,9 @@ hrisRelationship.setup = function() { // Add the foreign key column var sql = 'ALTER TABLE '+AD.Defaults.dbName+'.'+ objA.object_table + ' ADD '; - sql += objB.object_pkey + ' int(10) UNSIGNED'; - sql += ';' + sql += objB.object_pkey + ' int(10) UNSIGNED;'; // Add an index - sql + 'ALTER TABLE '+AD.Defaults.dbName+'.'+ objA.object_table + ' ADD INDEX (' + objB.object_pkey + ')' ; + sql += 'ALTER TABLE '+AD.Defaults.dbName+'.'+ objA.object_table + ' ADD INDEX (' + objB.object_pkey + ');' ; console.log(sql) db.runSQL(sql,[], function(err, results, fields){ if (err) {