[svn:dbi] r14231 - dbi/trunk/lib/DBD

Author: REHSACK
Date: Mon Jul  5 06:12:56 2010
New Revision: 14231

Modified:
   dbi/trunk/lib/DBD/File.pm

Log:
remove sql_* attrs from initialization and tidy


Modified: dbi/trunk/lib/DBD/File.pm
==============================================================================
--- dbi/trunk/lib/DBD/File.pm	(original)
+++ dbi/trunk/lib/DBD/File.pm	Mon Jul  5 06:12:56 2010
@@ -203,31 +203,11 @@
 	f_valid_attrs    => 1, # File valid attributes
 	f_readonly_attrs => 1, # File readonly attributes
 	};
-    $dbh->{sql_valid_attrs} = {
-	sql_handler                => 1, # Nano or S:S
-	sql_nano_version           => 1, # Nano version
-	sql_statement_version      => 1, # S:S version
-	sql_flags                  => 1, # flags for SQL::Parser
-	sql_quoted_identifier_case => 1, # case for quoted identifiers
-	sql_identifier_case        => 1, # case for non-quoted identifiers
-	sql_parser_object          => 1, # SQL::Parser instance
-	sql_valid_attrs            => 1, # SQL valid attributes
-	sql_readonly_attrs         => 1, # SQL readonly attributes
-	};
     $dbh->{f_readonly_attrs} = {
 	f_version        => 1, # DBD::File version
 	f_valid_attrs    => 1, # File valid attributes
 	f_readonly_attrs => 1, # File readonly attributes
 	};
-    $dbh->{sql_readonly_attrs} = {
-	sql_handler                => 1, # Nano or S:S
-	sql_nano_version           => 1, # Nano version
-	sql_statement_version      => 1, # S:S version
-	sql_quoted_identifier_case => 1, # case for quoted identifiers
-	sql_parser_object          => 1, # SQL::Parser instance
-	sql_valid_attrs            => 1, # SQL valid attributes
-	sql_readonly_attrs         => 1, # SQL readonly attributes
-	};
 
     return $dbh;
     } # init_valid_attributes
@@ -277,9 +257,8 @@
 
 sub disconnect ($)
 {
-    $_[0]->STORE (Active => 0);
     %{$_[0]->{f_meta}} = ();
-    return 1;
+    return $_[0]->SUPER::disconnect ();
     } # disconnect
 
 sub validate_STORE_attr
@@ -299,7 +278,7 @@
 	}
 
     return $dbh->SUPER::validate_STORE_attr ($attrib, $value);
-}
+    } # validate_STORE_attr
 
 sub get_f_versions
 {