소스 검색

db.createdb/db.dropdb: major update
now modules are functional for SQLite/PostgreSQL driver


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53607 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 12 년 전
부모
커밋
591170723c
4개의 변경된 파일77개의 추가작업 그리고 27개의 파일을 삭제
  1. 39 15
      db/db.createdb/db.createdb.html
  2. 3 2
      db/db.createdb/main.c
  3. 33 9
      db/db.dropdb/db.dropdb.html
  4. 2 1
      db/db.dropdb/main.c

+ 39 - 15
db/db.createdb/db.createdb.html

@@ -1,38 +1,62 @@
 <h2>DESCRIPTION</h2>
 
-<em>db.createdb</em> allows the user to create a new empty database through
-different drivers. A working database connection needs to be established.  
+<em>db.createdb</em> allows the user to create a new empty database
+through different drivers. A working database connection needs to be
+established, see <em><a href="db.login.html">db.login</a></em>.
 
-<h2>EXAMPLE</h2>
+<p>
+Currently only <a href="grass-sqlite.html">SQLite</a>
+and <a href="grass-pg.html">PostgreSQL</a> database drivers are
+supported.
+
+<h2>EXAMPLES</h2>
 
-<em>Create a new PostgreSQL database (if PostgreSQL connection is established
-through odbc driver)</em><br>
+<h3>Create a new SQLite file-based database</h3>
 
 <div class="code"><pre>
-db.createdb driver=odbc database=grass60test
+db.createdb driver=sqlite database=/opt/sqlite.db
 </pre></div>
 
-<p>
-<em>Create a new PostgreSQL database (if PostgreSQL connection is established
-through pg driver)</em><br>
+<h3>Create a new PostgreSQL database</h3>
+
+Create a new PostgreSQL database (if PostgreSQL connection is
+established through <em>odbc</em> driver):
+
+<div class="code"><pre>
+db.createdb driver=odbc database=grasstest
+</pre></div>
+
+Create a new PostgreSQL database (if PostgreSQL connection is established
+through <em>pg</em> driver):
+
 <div class="code"><pre>
-db.createdb driver=pg database='host=pgserver.itc.it,dbname=grass60test'
+db.createdb driver=pg database=grasstest
 </pre></div>
 
+<h2>TODO</h2>
+
+Support other database drivers too.
+
 <h2>SEE ALSO</h2>
 
 <em>
+<a href="db.dropdb.html">db.dropdb</a>,
 <a href="db.columns.html">db.columns</a>,
 <a href="db.describe.html">db.describe</a>,
 <a href="db.drivers.html">db.drivers</a>,
 <a href="db.droptable.html">db.droptable</a>,
 <a href="db.execute.html">db.execute</a>,
 <a href="db.login.html">db.login</a>,
-<a href="db.tables.html">db.tables</a>,
-<a href="sql.html">GRASS SQL interface</a></em>
+<a href="db.tables.html">db.tables</a>
+</em>
 
-<h2>AUTHOR</h2>
+<p>
+<a href="sql.html">GRASS SQL interface</a>
+
+<h2>AUTHORS</h2>
 
-Radim Blazek, ITC-Irst, Trento, Italy
+Radim Blazek, ITC-Irst, Trento, Italy<br>
+SQLite and PostgreSQL support by Martin Landa, Czech Technical University in Prague, Czech Republic
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>

+ 3 - 2
db/db.createdb/main.c

@@ -61,7 +61,8 @@ static void parse_command_line(int argc, char **argv)
     driver = G_define_standard_option(G_OPT_DB_DRIVER);
     driver->options = db_list_drivers();
     driver->required = YES;
-
+    driver->answer = (char *) db_get_default_driver_name();
+    
     database = G_define_standard_option(G_OPT_DB_DATABASE);
     database->required = YES;
 
@@ -71,7 +72,7 @@ static void parse_command_line(int argc, char **argv)
     G_add_keyword(_("attribute table"));
     G_add_keyword(_("SQL"));
     module->description = _("Creates an empty database.");
-
+    
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

+ 33 - 9
db/db.dropdb/db.dropdb.html

@@ -1,23 +1,47 @@
 <h2>DESCRIPTION</h2>
 
-<em>db.dropdb</em> removes an existing database. 
+<em>db.dropdb</em> removes an existing database using given
+database <b>driver</b>. Currently
+only <a href="grass-sqlite.html">SQLite</a>
+and <a href="grass-pg.html">PostgreSQL</a> database drivers are
+supported.
 
-<h2>EXAMPLE</h2>
+<h2>EXAMPLES</h2>
 
-<em>Remove an existing database connected through odbc</em><br>
-<b>db.dropdb driver=</b><em>odbc</em> <b>database=</b><em>g51test</em>
+<h3>Drop an existing database connected through SQLite driver</h3>
+
+<div class="code"><pre>
+db.dropdb driver=sqlite database=/opt/sqlite.db
+</pre></div>
+
+<h3>Drop an existing database connected through PostgreSQL driver</h3>
+
+<div class="code"><pre>
+db.dropdb driver=pg database=grasstest
+</pre></div>
+
+<h2>TODO</h2>
+
+Support other database drivers too.
 
 <h2>SEE ALSO</h2>
+
 <em>
+<a href="db.createdb.html">db.createdb</a>,
 <a href="db.describe.html">db.describe</a>,
 <a href="db.droptable.html">db.droptable</a>,
 <a href="db.execute.html">db.execute</a>,
 <a href="db.login.html">db.login</a>,
-<a href="db.tables.html">db.tables</a>,
-<a href="sql.html">GRASS SQL interface</a></em>
+<a href="db.tables.html">db.tables</a>
+</em>
+
+<p>
+<a href="sql.html">GRASS SQL interface</a>
 
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
 
-Radim Blazek, ITC-Irst, Trento, Italy
+Radim Blazek, ITC-Irst, Trento, Italy<br>
+SQLite and PostgreSQL support by Martin Landa, Czech Technical University in Prague, Czech Republic
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>

+ 2 - 1
db/db.dropdb/main.c

@@ -61,6 +61,7 @@ static void parse_command_line(int argc, char **argv)
     driver = G_define_standard_option(G_OPT_DB_DRIVER);
     driver->options = db_list_drivers();
     driver->required = YES;
+    driver->answer = (char *) db_get_default_driver_name();
 
     database = G_define_standard_option(G_OPT_DB_DATABASE);
     database->required = YES;
@@ -70,7 +71,7 @@ static void parse_command_line(int argc, char **argv)
     G_add_keyword(_("database"));
     G_add_keyword(_("attribute table"));
     G_add_keyword(_("SQL"));
-    module->description = _("Removes a database.");
+    module->description = _("Removes an existing database.");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);