Enable support for multiple DBDI drivers.

timbunce · Jul 27, 2010 · e0c7a61 · e0c7a61
1 parent 28e0ca2
commit e0c7a61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/DBDI_pg.pm6 b/DBDI_pg.pm6
@@ -110,14 +110,17 @@ class DBDI_pg::Driver does java::sql::Driver {
 
     DBDI::DriverManager.registerDriver( DBDI_pg::Driver.new );
 
-
     multi method connect (
-        Str $url,
+        Str $url is copy,
         Hash $prop,
     --> java::sql::Connection
     ) {
         say "> connect '$url'";
+
+        return fail() if not $url ~~ s/^dbdi\:postgres\://;
+
         my $conninfo = "host=localhost $url user=$prop.<user> password=$prop.<password>";
+        say "- connect '$conninfo'";
         my $db_conn = PQconnectdb($conninfo);
         if (PQstatus($db_conn) != CONNECTION_OK) {
             my $msg = PQerrorMessage($db_conn);

diff --git a/dbdi.pl6 b/dbdi.pl6
@@ -5,7 +5,7 @@ use DBDI_pg;
 
 my $dbname = @*ARGS.shift || prompt 'Database: ';
 
-my $con = DBDI::DriverManager.getConnection("dbname=$dbname", 'testuser', 'testpass');
+my $con = DBDI::DriverManager.getConnection("dbdi:postgres:dbname=$dbname", 'testuser', 'testpass');
 
 while prompt 'SQL: ' -> $sql {