[svn-commits] r166 - in branches/advisor/src/back: opf/opz scf/scm

[thial01 at ingres.com]

Author: thial01
Date: 2008-07-18 08:06:25 -0700 (Fri, 18 Jul 2008)
New Revision: 166

Modified:
   branches/advisor/src/back/opf/opz/opzaddatts.c
   branches/advisor/src/back/scf/scm/scmima.c
   branches/advisor/src/back/scf/scm/scmmain.c
Log:
Fixing more bugs with index handling - see #174


Modified: branches/advisor/src/back/opf/opz/opzaddatts.c
===================================================================
--- branches/advisor/src/back/opf/opz/opzaddatts.c	2008-07-18 08:34:25 UTC (rev 165)
+++ branches/advisor/src/back/opf/opz/opzaddatts.c	2008-07-18 15:06:25 UTC (rev 166)
@@ -250,7 +250,9 @@
 
         if (	rel != NULL 
         		&& 
-        		rel->rdr_attr[dmfattr] != NULL ) 
+        		rel->rdr_attr[dmfattr] != NULL 
+        		&&
+        		rel->rdr_rel->tbl_id.db_tab_index == 0 ) 
         {
             /* Log the attribute for the design analyzer */
         	scm_log_attribute(

Modified: branches/advisor/src/back/scf/scm/scmima.c
===================================================================
--- branches/advisor/src/back/scf/scm/scmima.c	2008-07-18 08:34:25 UTC (rev 165)
+++ branches/advisor/src/back/scf/scm/scmima.c	2008-07-18 15:06:25 UTC (rev 166)
@@ -309,7 +309,7 @@
 	0, MOidata_index
     },
     {
-    MO_CDATA_INDEX, "exp.scf.scm.idx.attribute_id",
+    MO_CDATA_INDEX, "exp.scf.scm.idx.index_id",
 	MO_SIZEOF_MEMBER(SCM_INDEX, index_id), MO_READ, scm_idx_index_class,
 	CL_OFFSETOF(SCM_INDEX, index_id), MOintget, MOnoset,
 	0, MOidata_index

Modified: branches/advisor/src/back/scf/scm/scmmain.c
===================================================================
--- branches/advisor/src/back/scf/scm/scmmain.c	2008-07-18 08:34:25 UTC (rev 165)
+++ branches/advisor/src/back/scf/scm/scmmain.c	2008-07-18 15:06:25 UTC (rev 166)
@@ -1294,7 +1294,7 @@
 	STncpy(index->name, name, DB_MAXNAME);
 	index->database[DB_MAXNAME-1] = '\0';
 	index->name[DB_MAXNAME-1] = '\0';
-	index->time = 0;
+	index->time = 1;
 	/*
 	** If this index is never actually used
 	** this remains at 0 and we should remove