Changeset e905db1 in github

Timestamp:

Oct 14, 2008 8:49:44 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

32eb29f

Parents:

871ca9a

Message:

Set postgres-specific schema options + fix indentation

Files:

• bin/dumpschema.php (modified) (4 diffs)
• program/include/rcube_mdb2.php (modified) (1 diff)

bin/dumpschema.php

@@ -1 +1 @@
 <?php
 /*
+ #!/usr/bin/php
 
  +-----------------------------------------------------------------------+
@@ -46 +47 @@
         'force_defaults' => false,
         'portability' => false,
-        'disable_smart_seqname' => true,
-        'seqname_format' => '%s'
 );
 
-$schema =& MDB2_Schema::factory($config->get('db_dsnw'), $options);
+$dsnw = $config->get('db_dsnw');
+$dsn_array = MDB2::parseDSN($dsnw);
+
+// set options for postgres databases
+if ($dsn_array['phptype'] == 'pgsql') {
+        $options['disable_smart_seqname'] = true;
+        $options['seqname_format'] = '%s';
+}
+
+$schema =& MDB2_Schema::factory($dsnw, $options);
 $schema->db->supported['transactions'] = false;
 
-                        
+
 // send as text/xml when opened in browser
 if ($_SERVER['REMOTE_ADDR'])
@@ -69 +77 @@
         
         $definition = $schema->getDefinitionFromDatabase();
+        $definition['charset'] = 'utf8';
+
         if (PEAR::isError($definition)) {
                 $error = $definition->getMessage() . ' ' . $definition->getUserInfo();
@@ -82 +92 @@
 $schema->disconnect();
 
-//if ($error)
-//      fputs(STDERR, $error);
+if ($error && !$_SERVER['REMOTE_ADDR'])
+        fputs(STDERR, $error);
 
 ?>

program/include/rcube_mdb2.php

@@ -87 +87 @@
 
     if ($this->db_provider == 'pgsql') {
-        $db_options['disable_smart_seqname'] = true;
-        $db_options['seqname_format'] = '%s';
-      }
+      $db_options['disable_smart_seqname'] = true;
+      $db_options['seqname_format'] = '%s';
+    }
 
     $dbh = MDB2::connect($dsn, $db_options);