Changeset 55caf5d in tol

Timestamp:

Jun 10, 2009, 1:28:52 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3109e3a

Parents:

0bbcc27

Message:

Fixes #697

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1059 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/data/db/_db_connect.tol (modified) (3 diffs)

tol/stdlib/data/db/_db_connect.tol

@@ -30 +30 @@
     Text _.user;
     Text _.password;
+    Text _.server;
     Text _.driver;
-    Text _.server;
     Text _.defaultDB;
     Real _.isOpen;
@@ -39 +39 @@
       If(_.isOpen, 1,
       {
-        Real ok = DBOpen(_.alias, _.user, _.password, 
-                         [[_.driver, _.defaultDB, _.server]]);
+      //VBR: Esto es un parche para salvar el ticket #697 pero lo adecuado 
+      //sería poder usar los argumentos adicionales con el driver ODBC sin 
+      //necesidad de crear el alias en la configuración de herramientas del
+      //sistema
+        Real ok = If(_.driver=="odbc",
+          DBOpen(_.alias, _.user, _.password),
+          DBOpen(_.alias, _.user, _.password, 
+                 [[_.driver, _.defaultDB, _.server]]));
         Real _.isOpen := ok;
         WriteLn("[DBConnect::"+_.alias+"::Open] "+
@@ -90 +96 @@
       Text _.user      = user;
       Text _.password  = password;
-      Text _.driver    = driver;
       Text _.server    = server;
+      Text _.driver    = 
+      {
+        Text dr = ToLower(driver);
+        Case(
+          dr=="postgresql","postgres",
+          dr=="pgsql",     "postgres",
+          dr=="postgres",  "postgres",
+          dr=="mysql",     "mysql",
+          dr=="odbc",      "odbc",
+          1==1,            
+          {
+            WriteLn("Unknown driver "+driver+". Using default odbc","W");
+            "odbc"
+          }
+        )
+      };
+      //VBR: Curiosamente el driver ODBC funciona con los arguemntos 
+      //adicionales si se sustituye defaultDataBase por alias
+      //Text _.defaultDB = If(_.driver=="odbc", alias, defaultDataBase);
       Text _.defaultDB = defaultDataBase;
+ 
       Real _.isOpen    = false
     ]];