Using the new general association definitions

No SQL_ or CROSS_ is needed any more.

Author: asishallab

data_model_definitions/breeding_pool.json

@@ -7,7 +7,7 @@
 	},
 	"associations" : {
 		"genotypes" : {
-			"type" : "sql_hasMany",
+			"type" : "hasMany",
 			"target" : "genotype",
 			"targetKey" : "breeding_pool_id",
 			"targetStorageType" : "sql",

data_model_definitions/field_plot.json

@@ -10,7 +10,7 @@
 	},
 	"associations" : {
 		"genotype" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "genotype",
 			"targetKey" : "genotype_id",
 			"targetStorageType" : "sql",

data_model_definitions/genotype.json

@@ -9,23 +9,23 @@
 
   "associations": {
     "mother": {
-      "type": "sql_belongsTo",
+      "type": "belongsTo",
       "target": "individual",
       "targetKey": "mother_id",
       "targetStorageType": "sql",
       "label": "name",
       "sublabel": "id"
     },
     "father": {
-      "type": "sql_belongsTo",
+      "type": "belongsTo",
       "target": "individual",
       "targetKey": "father_id",
       "targetStorageType": "sql",
       "label": "name",
       "sublabel": "id"
     },
     "breeding_pool": {
-      "type": "sql_belongsTo",
+      "type": "belongsTo",
       "target": "breeding_pool",
       "targetKey": "breeding_pool_id",
       "targetStorageType": "sql",

data_model_definitions/individual.json

@@ -7,15 +7,15 @@
 	},
 	"associations" : {
 		"genotype" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "genotype",
 			"targetKey" : "genotype_id",
 			"targetStorageType" : "sql",
 			"label": "name",
       "sublabel": "id"
 		},
 		"marker_data_snps" : {
-			"type" : "sql_hasMany",
+			"type" : "hasMany",
 			"target" : "marker_data",
 			"targetKey" : "individual_id",
 			"targetStorageType" : "sql",

data_model_definitions/marker_data.json

@@ -7,7 +7,7 @@
 	},
 	"associations" : {
 		"individual" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "individual",
 			"targetKey" : "individual_id",
 			"targetStorageType" : "sql",

data_model_definitions/measurement.json

@@ -11,7 +11,7 @@
 	},
 	"associations": {
 		"field_plot": {
-			"type": "sql_belongsTo",
+			"type": "belongsTo",
 			"target": "field_plot",
 			"targetKey": "field_plot_id",
 			"targetStorageType": "sql",

data_model_definitions/nuc_acid_library_result.json

@@ -12,7 +12,7 @@
 	},
 	"associations" : {
 		"sample" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "sample",
 			"targetKey" : "sample_id",
 			"targetStorageType" : "sql",

data_model_definitions/role.json

@@ -7,7 +7,7 @@
   },
   "associations" : {
     "users" : {
-      "type" : "sql_belongsToMany",
+      "type" : "belongsToMany",
       "target" : "user",
       "targetKey" : "userId",
       "sourceKey" : "roleId",

data_model_definitions/sample.json

@@ -12,23 +12,23 @@
 	},
 	"associations" : {
 		"individual" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "individual",
 			"targetKey" : "individual_id",
 			"targetStorageType" : "sql",
 			"label": "name",
 			"sublabel": "id"
 		},
 		"sequencing_experiment" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "sequencing_experiment",
 			"targetKey" : "sequencing_experiment_id",
 			"targetStorageType" : "sql",
 			"label": "name",
 			"sublabel": "platform"
 		},
 		"library_data" : {
-			"type" : "sql_hasMany",
+			"type" : "hasMany",
 			"target" : "nuc_acid_library_result",
 			"targetKey" : "sample_id",
 			"targetStorageType" : "sql",

data_model_definitions/sequencing_experiment.json

@@ -20,15 +20,15 @@
 	},
 	"associations" : {
 		"nuc_acid_library_results" : {
-			"type" : "sql_hasMany",
+			"type" : "hasMany",
 			"target" : "nuc_acid_library_result",
 			"targetKey" : "sequencing_experiment_id",
 			"targetStorageType" : "sql",
 			"label": "lab_code",
       "sublabel": "file_name"
 		},
 		"samples" : {
-			"type" : "sql_hasMany",
+			"type" : "hasMany",
 			"target" : "sample",
 			"targetKey" : "sequencing_experiment_id",
 			"targetStorageType" : "sql",

data_model_definitions/transcript_count.json

@@ -9,7 +9,7 @@
 	},
 	"associations" : {
 		"sample" : {
-			"type" : "sql_belongsTo",
+			"type" : "belongsTo",
 			"target" : "sample",
 			"targetKey" : "sample_id",
 			"targetStorageType" : "sql",

data_model_definitions/user.json

@@ -7,7 +7,7 @@
   },
   "associations" :{
     "roles" : {
-      "type" : "sql_belongsToMany",
+      "type" : "belongsToMany",
       "target" : "role",
       "targetKey" : "roleId",
       "sourceKey" : "userId",