Teach .describe to do populations and variables.

Author: riastradh-probcomp

shell/src/core.py

@@ -509,8 +509,9 @@ def dot_describe(self, line):
         tokens = line.split()
         if len(tokens) == 0:
             self.stdout.write('Usage: .describe table(s) [<table>...]\n')
+            self.stdout.write('       .describe population(s) [<pop>...]\n')
+            self.stdout.write('       .describe variables <pop>\n')
             self.stdout.write('       .describe generator(s) [<gen>...]\n')
-            self.stdout.write('       .describe columns <gen>\n')
             self.stdout.write('       .describe model(s) <gen> [<model>...]\n')
             return
         if casefold(tokens[0]) == 'table' or \
@@ -542,6 +543,31 @@ def dot_describe(self, line):
             ''' % (qualifier,)
             with self._bdb.savepoint():
                 pretty.pp_cursor(self.stdout, self._bdb.execute(sql, params))
+        elif casefold(tokens[0]) in ('population', 'populations'):
+            params = None
+            qualifier = None
+            if len(tokens) == 1:
+                params = ()
+                qualifier = '1'
+            else:
+                params = tokens[1:]
+                names = ','.join('?%d' % (i + 1,) for i in xrange(len(params)))
+                qualifier = '(name IN (%s))' % (names,)
+                ok = True
+                for population in params:
+                    if not core.bayesdb_has_population(self._bdb, population):
+                        self.stdout.write('No such population: %s\n' %
+                            (repr(population),))
+                        ok = False
+                if not ok:
+                    return
+            with self._bdb.savepoint():
+                cursor = self._bdb.sql_execute('''
+                    SELECT id, name, tabname
+                        FROM bayesdb_population
+                        WHERE %s
+                ''' % (qualifier,), params)
+                pretty.pp_cursor(self.stdout, cursor)
         elif casefold(tokens[0]) == 'generator' or \
                 casefold(tokens[0]) == 'generators':
             params = None
@@ -571,29 +597,30 @@ def dot_describe(self, line):
             with self._bdb.savepoint():
                 pretty.pp_cursor(self.stdout,
                     self._bdb.sql_execute(sql, params))
-        elif casefold(tokens[0]) == 'columns':
+        elif casefold(tokens[0]) == 'variables':
             if len(tokens) != 2:
-                self.stdout.write('Describe columns of what generator?\n')
+                self.stdout.write('Usage: .describe variables <population>\n')
                 return
-            generator = tokens[1]
+            population = tokens[1]
             with self._bdb.savepoint():
-                if not core.bayesdb_has_generator(self._bdb, generator):
-                    self.stdout.write('No such generator: %s\n' %
-                        (repr(generator),))
+                if not core.bayesdb_has_population(self._bdb, population):
+                    self.stdout.write('No such population: %r\n' %
+                        (population,))
                     return
-                generator_id = core.bayesdb_get_generator(self._bdb, generator)
+                population_id = core.bayesdb_get_population(
+                    self._bdb, population)
                 sql = '''
                     SELECT c.colno AS colno, c.name AS name,
-                            gc.stattype AS stattype, c.shortname AS shortname
-                        FROM bayesdb_generator AS g,
+                            v.stattype AS stattype, c.shortname AS shortname
+                        FROM bayesdb_population AS p,
                             (bayesdb_column AS c LEFT OUTER JOIN
-                                bayesdb_generator_column AS gc
+                                bayesdb_variable AS v
                                 USING (colno))
-                        WHERE g.id = ? AND g.id = gc.generator_id
-                            AND g.tabname = c.tabname
+                        WHERE p.id = ? AND p.id = v.population_id
+                            AND p.tabname = c.tabname
                         ORDER BY colno ASC;
                 '''
-                cursor = self._bdb.sql_execute(sql, (generator_id,))
+                cursor = self._bdb.sql_execute(sql, (population_id,))
                 pretty.pp_cursor(self.stdout, cursor)
         elif casefold(tokens[0]) == 'model' or \
                 casefold(tokens[0]) == 'models':
@@ -637,5 +664,5 @@ def dot_describe(self, line):
         else:
             self.stdout.write('Usage: .describe table(s) [<table>...]\n')
             self.stdout.write('       .describe generator(s) [<gen>...]\n')
-            self.stdout.write('       .describe columns <gen>\n')
+            self.stdout.write('       .describe variables <pop>\n')
             self.stdout.write('       .describe model(s) <gen> [<model>...]\n')