The R Project SVN – R-packages – Diff – /trunk/SQLiteDF/src/sqlite_dataframe.c

     sqlite3_stmt *stmt;
     int res;
     res = _create_factor_table2(iname_dst, factor_type, colname_dst);
     if (res == SQLITE_OK) {
         sprintf(g_sql_buf[2], "insert into [%s].[%s %s] select * from [%s].[%s %s]",
-                iname_src, factor_type, colname_src, iname_dst, factor_type,
+                iname_dst, factor_type, colname_dst, iname_src, factor_type,
-                colname_dst);
+                colname_src);
         res = sqlite3_prepare(g_workspace, g_sql_buf[2], -1, &stmt, 0);
-        if (res == SQLITE_OK) sqlite3_step(stmt);
+        if (res == SQLITE_OK) res = sqlite3_step(stmt);
         sqlite3_finalize(stmt);
+    }
     return res; /* error on dup name? */
+}
     sqlite3_stmt *stmt;
     int buflen = 0, idxlen, col_cnt, row_cnt, index;
     int i, j,res;
     int *col_indices, col_index_len, *dup_indices;
     int row_index_len = 0, force_new_df = LOGICAL(new_sdf)[0];
+    const char *colname;
+    /* dup_indices is used to handle when same column chosen more than once.
+     * e.g. iris[,c(1,1)] have names Sepal.Length, Sepal.Length.1 *
+     * col_indices is used to store the column index of selected columns
+     * in the sdf_data table */
     if (!USE_SDF1(iname, TRUE, TRUE)) return R_NilValue;
     sprintf(g_sql_buf[0], "select * from [%s].sdf_data ", iname);
     res = sqlite3_prepare(g_workspace, g_sql_buf[0], -1, &stmt, 0);
     /*
      * PROCESS COLUMN INDEX: set columns in the select statement
      */
     if (col == R_NilValue) {
         for (i = 1; i < col_cnt+1; i++) {
-            buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]",
+            colname = sqlite3_column_name(stmt, i);
-                    sqlite3_column_name(stmt, i));
+            buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]", colname);
+        }
         _expand_buf(0, buflen+20+strlen(iname));
         buflen += sprintf(g_sql_buf[0]+buflen, " from [%s].sdf_data", iname);
         col_index_len = col_cnt;
-        col_indices = (int *)R_alloc(idxlen, sizeof(int));
+        col_indices = (int *)R_alloc(col_cnt, sizeof(int));
-        dup_indices = (int *)R_alloc(idxlen, sizeof(int));
+        dup_indices = (int *)R_alloc(col_cnt, sizeof(int));
         for (i = 0; i < col_cnt; i++) { col_indices[i] = i; dup_indices[i] = 0; }
     } else if (col == R_NilValue || idxlen < 1) {
         sqlite3_finalize(stmt);
         return R_NilValue;
     } else if (IS_NUMERIC(col)) {
         for (i = 0; i < idxlen; i++) {
             /* no need to correct for 0 base because col 0 is [row name] */
             index = ((int) REAL(col)[i]);
             if (index > col_cnt) {
                 sqlite3_finalize(stmt);
-                Rprintf("Error: undefined columns selected\n");
+                error("undefined columns selected\n");
-                return R_NilValue;
             } else if (index > 0) {
-                buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]",
+                colname = sqlite3_column_name(stmt,index);
-                        sqlite3_column_name(stmt,index));
+                buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]", colname);
                 dup_indices[col_index_len] = 0;
                 for (j = 0; j < col_index_len; j++) {
                     if (col_indices[j] == index) dup_indices[col_index_len]++;
+                }
                 col_indices[col_index_len++] = index;
             } else if (index < 0) {
                 sqlite3_finalize(stmt);
-                Rprintf("Error: negative indices not supported.\n");
+                error("negative indices not supported.\n");
-                return R_NilValue;
+            }
+        }
         if (col_index_len == 0) {
             sqlite3_finalize(stmt);
         for (i = 0; i < idxlen; i++) {
             /* no need to correct for 0 base because col 0 is [row name] */
             index = INTEGER(col)[i];
             if (index > col_cnt) {
                 sqlite3_finalize(stmt);
-                Rprintf("Error: undefined columns selected\n");
+                error("undefined columns selected\n");
-                return R_NilValue;
             } else if (index > 0) {
-                buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]",
+                colname = sqlite3_column_name(stmt,index);
-                        sqlite3_column_name(stmt,index));
+                buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]", colname);
                 dup_indices[col_index_len] = 0;
                 for (j = 0; j < col_index_len; j++) {
                     if (col_indices[j] == index) dup_indices[col_index_len]++;
+                }
                 col_indices[col_index_len++] = index;
             } else if (index < 0) {
                 sqlite3_finalize(stmt);
-                Rprintf("Error: negative indices not supported.\n");
+                error("negative indices not supported.\n");
-                return R_NilValue;
+            }
+        }
         if (col_index_len == 0) {
             sqlite3_finalize(stmt);
         col_index_len = 0;
         for (i = 0; i < col_cnt; i++) {
             if (LOGICAL(col)[i%idxlen]) {
                 buflen += sprintf(g_sql_buf[0]+buflen, ",[%s]",
                         sqlite3_column_name(stmt,i+1));
                 dup_indices[col_index_len] = 0;
                 col_indices[col_index_len++] = i;
+            }
+        }
         if (col_index_len == 0) {
             sqlite3_finalize(stmt);
-            Rprintf("Warning: no column selected.\n");
+            warning("no column selected.\n");
             return R_NilValue;
         } else {
             _expand_buf(0, buflen+20+strlen(iname));
             buflen += sprintf(g_sql_buf[0]+buflen, " from [%s].sdf_data", iname);
+        }
     } else {
         sqlite3_finalize(stmt);
-        Rprintf("Error: don't know how to handle column index.\n");
+        error("don't know how to handle column index.\n");
-        return R_NilValue;
+    }
     /*
      * PROCESS ROW INDEX: setup limit or where clause
      */
         } if (col_index_len > 1 || (force_new_df && col_index_len == 1)) {
             /* create a new SDF, logic similar to sdf_create_sdf */
             /* find a new name. data<n> ? */
             char *iname2;
-            const char *colname;
             int namelen, sql_len, sql_len2;
             iname2 = _create_sdf_skeleton1(R_NilValue, &namelen, TRUE);
             /* create sdf_data table */

The R Project SVN R-packages

(root)/trunk/SQLiteDF/src/sqlite_dataframe.c – Rev 3471 → 3473