removing redundant env declaration

[migration-tools.git] / mig-bin / mig-gsheet

diff --git a/mig-bin/mig-gsheet b/mig-bin/mig-gsheet
index 84c3250..b876e9b 100755 (executable)
--- a/mig-bin/mig-gsheet
+++ b/mig-bin/mig-gsheet
@@ -14,10 +14,6 @@ use lib "$FindBin::Bin/";
 my $mig_bin = "$FindBin::Bin/";
 use Mig;
 use strict;
-use Env qw(
-    HOME PGHOST PGPORT PGUSER PGDATABASE MIGSCHEMA
-    MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
-    );
 use Switch;
 use Cwd 'abs_path';
 use Pod::Usage;
@@ -119,22 +115,23 @@ if (defined $cmd_pull) {
 
 if (defined $cmd_push) {
     print "Pushing ";
+    my @tab_names;
     if ($cmd_push eq 'all') {
-        print "all tables.\n";
-        $sql = 'SELECT table_name FROM gsheet_tracked_table;';
+        print "all worksheets.\n";
+        $sql = 'SELECT tab_name FROM gsheet_tracked_table;';
         $sth = $dbh->prepare($sql);
         $ra = $sth->execute();
         while (my @row = $sth->fetchrow_array) {
-            push @table_names, $row[0];
+            push @tab_names, $row[0];
         }
     } else {
-        print "only table $cmd_push.\n";
+        print "only worksheet $cmd_push.\n";
         if (!defined $cmd_push) { abort('command incomplete'); }
-        push @table_names, $cmd_push;
+        push @tab_names, $cmd_push;
     }
-    foreach my $pull_tb (@table_names) {
+    foreach my $push_ws_name (@tab_names) {
+        my $pull_tb = get_table_name($push_ws_name,$dbh);
         my @table_headers = get_pg_column_headers($pull_tb,$MIGSCHEMA);
-        my $push_ws_name = get_worksheet_name($pull_tb,$dbh);
         print "worksheetname: $push_ws_name\n";
         my $push_ws = $spreadsheet->worksheet( {title => $push_ws_name} );
         if (!defined $push_ws) { next; }
@@ -189,7 +186,7 @@ sub export_table {
     my $efile = $MIGGITDIR . $table . '_' . $date . '_' . $hms . '.tsv';
     my @data;
     my $record_count = 0;
-    $dbh->do("COPY $table TO STDOUT CSV HEADER;");
+    $dbh->do("COPY $table TO STDOUT CSV DELIMITER E'\t' HEADER;");
     1 while $dbh->pg_getcopydata(\$data[$record_count++]) >= 0;
     open (my $eout, '>', $efile) or abort("Could NOT open $efile.");
     foreach my $d (@data) {
@@ -202,7 +199,7 @@ sub export_table {
 
 sub die_if_gsheet_tracked_table_does_not_exist {
     if (!check_for_gsheet_tracked_table()) {
-        die "Table $MIGSCHEMA.gsheet_tracked_table does not exist.  Bailing...\n";
+        die "Table gsheet_tracked_table does not exist.  Bailing...\n";
     }
 }
 
@@ -289,21 +286,21 @@ sub get_table_name {
     return $table_name;
 }
 
-sub get_worksheet_name {
-    my $table = shift;
-    my $dbh = shift;
-
-    my $sql = 'SELECT tab_name FROM gsheet_tracked_table WHERE table_name = \'' . $table . '\';';
-    print "$sql \n";
-    my $sth = $dbh->prepare($sql);
-    my $xs = $sth->execute();
-    my $worksheet_name;
-    while (my @row = $sth->fetchrow_array) {
-        $worksheet_name = $row[0];
-    }
-
-    return $worksheet_name;
-}
+#sub get_worksheet_name {
+#    my $table = shift;
+#    my $dbh = shift;
+#
+#    my $sql = 'SELECT tab_name FROM gsheet_tracked_table WHERE table_name = \'' . $table . '\';';
+#    print "$sql \n";
+#    my $sth = $dbh->prepare($sql);
+#    my $xs = $sth->execute();
+#    my $worksheet_name;
+#    while (my @row = $sth->fetchrow_array) {
+#        $worksheet_name = $row[0];
+#    }
+#
+#    return $worksheet_name;
+#}
 
 
 sub check_for_gsheet_tracked_column {