6e1d2ac57296949e28c8111d65c49bb2b8a0c454 kate Fri May 30 11:57:04 2014 -0700 Remove debug stuff diff --git src/test/buildTableDescriptions.pl src/test/buildTableDescriptions.pl index 1cd2ec4..faffa41 100755 --- src/test/buildTableDescriptions.pl +++ src/test/buildTableDescriptions.pl @@ -374,31 +374,31 @@ ############################################################################ # MAIN my %tableAutoSql = slurpAutoSql($kentSrc); my %fieldsAutoSql = indexAutoSqlByFields(\%tableAutoSql); my %tableAnchors = parseGbdDescriptions($gbdDPath); my $hgConf = HgConf->new($opt_hgConf); my @auxDbs = ('hgFixed', 'proteome'); my @dbs = (defined $opt_db) ? split(',', $opt_db) : (&getActiveDbs($hgConf), @auxDbs); foreach my $db (@dbs) { my $sqlFile = "$db.tableDescriptions.sql"; open(SQL, ">$sqlFile") || die "Can't open $sqlFile for writing"; print SQL "use $db;\n"; - print SQL "drop table if exists tableDescriptions_kate;"; + print SQL "drop table if exists tableDescriptions;"; open(F, "$kentSrc/hg/lib/tableDescriptions.sql") || die "Can't open $kentSrc/hg/lib/tableDescriptions.sql"; while (<F>) { print SQL; } close (F); my $trackDb = TrackDb->new($db); my %tableTypes = $trackDb->getTrackNamesTypes(); my %tableFields = &getTableFields($hgConf, $db); foreach my $table (sort keys %tableFields) { next if ($table =~ /^(trackDb|hgFindSpec)_/); if ((! defined $tableAutoSql{$table}) || ($tableFields{$table} ne $tableAutoSql{$table}->{fields})) { my $as = &matchAutoSqlByFields($tableFields{$table}, \%tableAutoSql, @@ -430,26 +430,26 @@ my $as = $tableAutoSql{$table}; if (defined $as) { if ($tableFields{$table} ne $as->{fields}) { print "$db.$table FIELD MISMATCH:\n"; print "$db.$table table fields: $tableFields{$table}\n"; print "$db.$table autoSql fields: $as->{fields} [$as->{tableName}]\n"; } } else { print "$db.$table: No AutoSql.\n"; } my $anchor = $tableAnchors{$table} || ""; #*** should suggest addition to gbdD of table&.as if not already in there; #*** should complain about gbdD tables not in any active db. my $asd = (defined $as) ? $as->{autoSql} : ""; $asd =~ s/'/\\'/g; - print SQL "INSERT INTO tableDescriptions_kate (tableName, autoSqlDef, gbdAnchor)" + print SQL "INSERT INTO tableDescriptions (tableName, autoSqlDef, gbdAnchor)" . " values ('$table', '$asd', '$anchor');\n"; } close(SQL); if (! $noLoad) { (! system("/cluster/bin/x86_64/hgsql $db < $sqlFile")) || die "hgsql error for $sqlFile"; - print "Loaded $db.tableDescriptions_kate.\n"; + print "Loaded $db.tableDescriptions.\n"; unlink($sqlFile); } }