[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11176-g7986ea8

[Michal Čihař]

The branch, master has been updated
       via  7986ea8f35c539699f279b3bbd7a9196822a096d (commit)
       via  dafefcd2759178980f8d9ed87edbbafe2ee94a5e (commit)
      from  008b96aaec574b7d3310883c893f6023d620fc01 (commit)


- Log -----------------------------------------------------------------
commit 7986ea8f35c539699f279b3bbd7a9196822a096d
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:36:01 2011 +0200

    Free result once we do not need it

commit dafefcd2759178980f8d9ed87edbbafe2ee94a5e
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 14:35:43 2011 +0200

    More replacement of double quotes

-----------------------------------------------------------------------

Summary of changes:
 libraries/export/codegen.php |   54 +++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index a533dd4..35fe21d 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -242,44 +242,45 @@ class TableProperty
     function handleNHibernateCSBody($db, $table, $crlf)
     {
         $lines=array();
-        $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table)));
+        $result=PMA_DBI_query(sprintf('DESC %s.%s', PMA_backquote($db), PMA_backquote($table)));
         if ($result) {
             $tableProperties=array();
             while ($row = PMA_DBI_fetch_row($result)) {
                 $tableProperties[] = new TableProperty($row);
             }
-            $lines[] = "using System;";
-            $lines[] = "using System.Collections;";
-            $lines[] = "using System.Collections.Generic;";
-            $lines[] = "using System.Text;";
-            $lines[] = "namespace ".cgMakeIdentifier($db);
-            $lines[] = "{";
-            $lines[] = "    #region ".cgMakeIdentifier($table);
-            $lines[] = "    public class ".cgMakeIdentifier($table);
-            $lines[] = "    {";
-            $lines[] = "        #region Member Variables";
+            PMA_DBI_free_result($result);
+            $lines[] = 'using System;';
+            $lines[] = 'using System.Collections;';
+            $lines[] = 'using System.Collections.Generic;';
+            $lines[] = 'using System.Text;';
+            $lines[] = 'namespace ' . cgMakeIdentifier($db);
+            $lines[] = '{';
+            $lines[] = '    #region ' . cgMakeIdentifier($table);
+            $lines[] = '    public class ' . cgMakeIdentifier($table);
+            $lines[] = '    {';
+            $lines[] = '        #region Member Variables';
             foreach ($tableProperties as $tablePropertie) {
-                $lines[] = $tablePropertie->formatCs("        protected #dotNetPrimitiveType# _#name#;");
+                $lines[] = $tablePropertie->formatCs('        protected #dotNetPrimitiveType# _#name#;');
             }
-            $lines[] = "        #endregion";
-            $lines[] = "        #region Constructors";
-            $lines[] = "        public ".cgMakeIdentifier($table)."() { }";
+            $lines[] = '        #endregion';
+            $lines[] = '        #region Constructors';
+            $lines[] = '        public ' . cgMakeIdentifier($table).'() { }';
             $temp = array();
             foreach ($tableProperties as $tablePropertie) {
                 if (! $tablePropertie->isPK()) {
-                    $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#");
+                    $temp[] = $tablePropertie->formatCs('#dotNetPrimitiveType# #name#');
                 }
             }
-            $lines[] = "        public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")";
-            $lines[] = "        {";
+            $lines[] = '        public ' . cgMakeIdentifier($table) . '(' . implode(', ', $temp) . ')';
+            $lines[] = '        {';
             foreach ($tableProperties as $tablePropertie) {
                 if (! $tablePropertie->isPK()) {
-                    $lines[] = $tablePropertie->formatCs("            this._#name#=#name#;");
+                    $lines[] = $tablePropertie->formatCs('            this._#name#=#name#;');
                 }
             }
-            $lines[] = "        }";
-            $lines[] = "        #endregion";
-            $lines[] = "        #region Public Properties";
+            $lines[] = '        }';
+            $lines[] = '        #endregion';
+            $lines[] = '        #region Public Properties';
             foreach ($tableProperties as $tablePropertie) {
                 $lines[] = $tablePropertie->formatCs(''
                     . '        public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n"
@@ -289,11 +290,10 @@ class TableProperty
                     . '        }'
                     );
             }
-            $lines[] = "        #endregion";
-            $lines[] = "    }";
-            $lines[] = "    #endregion";
-            $lines[] = "}";
-            PMA_DBI_free_result($result);
+            $lines[] = '        #endregion';
+            $lines[] = '    }';
+            $lines[] = '    #endregion';
+            $lines[] = '}';
         }
         return implode("\n", $lines);
     }


hooks/post-receive
-- 
phpMyAdmin