imparcial 0.0.1 → 0.0.2

data/lib/imparcial/driver/abstract.rb

@@ -0,0 +1,255 @@
+require 'logger'
+
+require 'imparcial/driver/abstract/util'
+require 'imparcial/driver/abstract/result'
+require 'imparcial/driver/abstract/typemap'
+require 'imparcial/driver/abstract/sql'
+require 'imparcial/driver/abstract/expression'
+
+module Imparcial
+  module Driver
+  
+    # You have seriously to pay attention on this class.
+    # Basically speaking, it servers as abstraction for all new drivers.
+    # The idea behind Imparcial is to keep an abstract interface without
+    # exposing any dataabstract-specific-features.
+    # Of course, it's an impossible mission anyhow. There are so many 
+    # dataabases out there and there are so many cool features that
+    # make impossible not to expose them.
+    # We recommend you to obey the interface as much as possible.
+    # However you may develop some specific features.
+    # Please, keep an eye on specification(can be found in the website).
+  
+    class AbstractAdapter
+    
+      # Include SQL syntax generation.
+      # Here where all SQL syntax lies on.
+      
+      include AbstractSQL
+    
+      # Include the expression mechanism.
+      # Things like create table, drop table, select and so forth.
+      # They all come from this module.
+    
+      include AbstractExpression
+      
+      # Include some util methods.
+      # Things like quoting, unquoting.
+      
+      include AbstractUtil
+      
+      # Include Typemap mechanism.
+      
+      include AbstractTypemap
+         
+      # Let's also keep a track of the connection.
+      
+      attr_accessor :conn
+      alias_method  :connection, :conn
+      
+      # A logger is also required.
+      
+      attr_accessor :logger
+      
+      attr_accessor :host, :adapter, :port, :username, :password, :socket, :database
+      
+      #####################################################
+      #                                                   #
+      # Those are methods shared among all databases.     #
+      # Hardly, one will need to override them.           #
+      #                                                   #
+      #####################################################
+
+      # === Description
+      # Display connection handle.
+      # 
+      # === Returning
+      # a handle.
+
+      def conn
+      
+        raise AdapterConnectionError.new('Have you connected already?') unless @conn
+        @conn
+      
+      end
+    
+      # === Description
+      # Terminate a connection.
+      # 
+      # === Returning
+      # nothing.    
+
+      def close
+      
+        conn.close
+      
+      end
+    
+      # === Description
+      # After executing a statement, the method query will bring a result.
+      # 
+      # === Returning
+      # result to a query.  
+                        
+      def result
+      
+        raise ResultError.new('Have you made any query?') unless @result
+        @result
+      
+      end
+
+      #####################################################
+      #                                                   #
+      # Subclasses must override those following methods. #
+      # They are driver-specific.                         #
+      #                                                   #
+      #####################################################
+      
+      # === Description
+      # Stablish a connection.
+      # 
+      # === Returning
+      # nothing.    
+      
+      def connect
+      
+        raise FeatureNotFound
+      
+      end
+    
+      # === Description
+      # Execute a statement directly to the adapter.
+      # 
+      # === Returning
+      # The method result will be avaliable.    
+                  
+      def query ( sql )
+            
+        raise FeatureNotFound
+      
+      end     
+  
+      # === Description
+      # get the adapter specific's exception.
+      # 
+      # === Returning
+      # an exception class.     
+      
+      def adapter_specific_exception
+        
+        raise FeatureNotFound
+        
+      end
+      
+      def last_insert_id
+        
+        raise FeatureNotFound
+        
+      end
+      
+      public
+      
+      #####################################################
+      #                                                   #
+      #                Logging mechanism                  #
+      #                                                   #
+      #####################################################   
+
+      def enable_table_logging
+        
+        @table_logging = true
+        
+      end
+      
+      def disable_table_logging
+        
+        @table_logging = false
+        
+      end
+      
+      def enable_column_logging
+        
+        @column_logging = true
+        
+      end
+      
+      def disable_column_logging
+        
+        @column_logging = false
+        
+      end
+      
+      def enable_index_logging
+        
+        @index_logging = true
+        
+      end
+      
+      def disable_index_logging
+        
+        @index_logging = false
+        
+      end      
+      
+      def enable_select_logging
+        
+        @select_logging = true
+        
+      end
+      
+      def disable_select_logging
+        
+        @select_logging = false
+        
+      end 
+      
+      def enable_update_logging
+        
+        @update_logging = true
+        
+      end
+      
+      def disable_update_logging
+        
+        @update_logging = false
+        
+      end
+      
+      def enable_insert_logging
+        
+        @insert_logging = true
+        
+      end
+      
+      def disable_insert_logging
+        
+        @insert_logging = false
+        
+      end      
+      
+      def enable_sequence_logging
+        
+        @sequence_logging = true
+        
+      end
+      
+      def disable_sequence_logging
+        
+        @sequence_logging = false
+        
+      end  
+      
+      def enable_record_logging
+        
+        @record_logging = true
+        
+      end
+      
+      def disable_record_logging
+        
+        @record_logging = false
+        
+      end       
+    end
+  end
+end

data/lib/imparcial/driver/mysql/expression/table.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver
-    module ExpressionMysql
+    module MysqlExpression
       module Table
         
         private
@@ -9,16 +9,7 @@ module Imparcial
           
           super.merge :engine => :optional
           
-        end
-                          
-        def field_to_column ( field )
-
-          column = super
-          column[:auto_increment] = field[:auto_increment] ? ' AUTO_INCREMENT' : ''
-        
-          column
-      
-        end         
+        end    
         
       end
     end

data/lib/imparcial/driver/mysql/expression.rb

@@ -1,11 +1,11 @@
-require 'imparcial/driver/mysql/expression/table'
-require 'imparcial/driver/mysql/expression/index'
+FileList[File.dirname(__FILE__)  + '/expression/*.rb'].each do |f|
+  require f
+end
 
 module Imparcial
   module Driver
-    module ExpressionMysql
+    module MysqlExpression
       include Table
-      include Index
     end
   end
 end

data/lib/imparcial/driver/mysql/result.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver
-    class ResultMysql < ResultBase
+    class MysqlResult < AbstractResult
     
       def rows
       

data/lib/imparcial/driver/mysql/sql/column.rb

@@ -0,0 +1,59 @@
+module Imparcial
+  module Driver
+    module MysqlSQL
+      module Column
+        
+        private
+        
+        def sql_for_modifying_columns ( options )
+
+          syntax = ''
+        
+          syntax += 'ALTER TABLE ' + quote(options[:table_name]) + ' '
+ 
+          options[:fields].each do |field|
+            
+            column = field_to_column field
+                         
+            syntax += "MODIFY COLUMN #{column[:name]} #{column[:type]}"
+            syntax += "(#{column[:size]})" if column[:size]
+            
+            syntax += ','
+            
+          end
+          
+          syntax.chop!
+                      
+          syntax
+        
+        end   
+      
+        def sql_for_renaming_column ( options )        
+          
+          old_name = options[:field].keys.first
+          new_name = options[:field].values.first
+          
+          field = get_column_information :table_name => options[:table_name], :field_name => old_name
+
+          column = field_to_column field
+                                        
+          syntax = ''
+        
+          syntax += 'ALTER TABLE ' + quote(options[:table_name]) + ' '
+                        
+          syntax += "CHANGE COLUMN #{column[:name]}"
+          syntax += " #{quote(new_name)}"
+          syntax += " #{column[:type]}" 
+          syntax += "(#{column[:size]})" if column[:size]
+          syntax += ','
+            
+          syntax.chop!
+                      
+          syntax
+          
+        end
+            
+      end
+    end
+  end
+end

data/lib/imparcial/driver/mysql/sql/constraint.rb

@@ -0,0 +1,39 @@
+module Imparcial
+  module Driver
+    module MysqlSQL
+      module Constraint
+
+        private
+
+        def sql_for_adding_auto_increment ( options )
+         
+          syntax  = 'ALTER TABLE ' + quote(options[:table_name]) + ' '
+          
+          syntax += "MODIFY COLUMN #{quote(options[:field])} INTEGER NOT NULL AUTO_INCREMENT"
+
+          syntax          
+          
+        end        
+        
+        def sql_for_adding_default_value ( options )
+          
+          syntax  = 'ALTER TABLE ' + quote(options[:table_name]) + ' '   
+          
+          for field, value in options[:fields]
+          
+            syntax += "ALTER COLUMN #{quote(field)} SET DEFAULT #{quote_value(value)},"
+            
+          end
+          
+          syntax.chop!
+     
+          syntax               
+          
+        end
+        
+     
+        
+      end
+    end
+  end
+end

data/lib/imparcial/driver/mysql/sql/index.rb

@@ -1,16 +1,15 @@
 module Imparcial
   module Driver
-    module SQLMysql   
+    module MysqlSQL 
       module Index
         
         private
         
         def sql_for_dropping_index ( options )
           
-          %{
-            DROP INDEX #{options[:index_name]} ON 
+          %{DROP INDEX #{options[:index_name]} ON 
             #{quote(options[:table_name])}
-          }
+           }
           
         end
         
@@ -18,32 +17,24 @@ module Imparcial
 
         def sql_for_index_exists? ( options )
           
-          %{
-            SELECT 1 FROM INFORMATION_SCHEMA.statistics
-            WHERE INDEX_NAME = #{quote_value(options[:index_name])}
-          }
+          %{SELECT 1 FROM INFORMATION_SCHEMA.statistics
+            WHERE table_schema != "mysql" AND
+            table_name = #{quote_value(options[:table_name])} AND
+            INDEX_NAME = #{quote_value(options[:index_name])}
+           }
           
         end            
         
-        def sql_for_retrieving_indexes
+        def sql_for_getting_indexes ( options )
           
-          %{
-          SELECT 
-            TABLE_NAME AS 'table',
-            COLUMN_NAME AS 'column',
-            INDEX_NAME AS 'index'
-            FROM INFORMATION_SCHEMA.statistics
-          }
+          %{SELECT table_name AS 'table', column_name AS 'column',\
+           index_name AS 'index' FROM INFORMATION_SCHEMA.statistics\
+           WHERE table_schema != 'mysql' 
+           AND table_name = #{quote_value(options[:table_name])}
+           }
           
         end
         
-        def sql_for_retrieving_indexes_for_table ( options )
-          
-          sql_for_retrieving_indexes + %{
-          WHERE TABLE_NAME = #{quote_value(options[:table_name])}
-          }
-          
-        end
         
       end
     end

data/lib/imparcial/driver/mysql/sql/sequence.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver
-    module SQLMysql
+    module MysqlSQL
       
       # Mysql doesn't support sequences.
       # We have to disable all them.

data/lib/imparcial/driver/mysql/sql/{table_metadata.rb → table.rb}

@@ -1,20 +1,44 @@
 module Imparcial
   module Driver
-    module SQLMysql
-      module TableMetadata
+    module MysqlSQL
+      module Table
+        
+        private
+        
+        def sql_for_creating_table ( options = {} )
+          
+          syntax  = super
+          
+          syntax += 'ENGINE = '
+          
+          # If any engine has not been specified, we make INNODB as default.
+          
+          if options[:engine]
+            
+            syntax += options[:engine].to_s
+                        
+          else
+            
+            syntax += 'INNODB'
+            
+          end
+          
+          syntax
+          
+        end           
         
         private
                  
         # Generate SQL statement for retrieving tables.
         
-        def sql_for_retrieving_tables
+        def sql_for_getting_tables
       
           'SHOW TABLES'
                 
         end  
                 
         # Generate SQL statement for retrieving columns.
-        
+=begin        
         def sql_for_retrieving_columns ( options = {} )
         
           %{
@@ -36,7 +60,7 @@ module Imparcial
           }
         
         end          
-        
+=end        
       end
     end
   end

data/lib/imparcial/driver/mysql/sql.rb

@@ -1,15 +1,15 @@
-require 'imparcial/driver/mysql/sql/table_operation'
-require 'imparcial/driver/mysql/sql/table_metadata'
-require 'imparcial/driver/mysql/sql/sequence'
-require 'imparcial/driver/mysql/sql/index'
+FileList[File.dirname(__FILE__)  + '/sql/*.rb'].each do |f|
+  require f
+end
 
 module Imparcial
   module Driver
-    module SQLMysql
-      include TableOperation
-      include TableMetadata
+    module MysqlSQL
+      include Table
       include Sequence
       include Index
+      include Constraint
+      include Column
     end
   end
 end

data/lib/imparcial/driver/mysql/typemap.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver    
-    module TypemapMysql
+    module MysqlTypemap
     
       def sql_types
       

data/lib/imparcial/driver/mysql/util.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver
-    module UtilMysql
+    module MysqlUtil
     
       def quote ( val )
       

data/lib/imparcial/driver/mysql.rb

@@ -1,48 +1,49 @@
 require 'mysql'
+
 require 'imparcial/driver/mysql/util'
-require 'imparcial/driver/mysql/typemap'
 require 'imparcial/driver/mysql/result'
+require 'imparcial/driver/mysql/typemap'
 require 'imparcial/driver/mysql/sql'
 require 'imparcial/driver/mysql/expression'
 
 module Imparcial
   module Driver    
-    class AdapterMysql < AdapterBase
-    
+    class MysqlAdapter < AbstractAdapter
+        
+      include MysqlUtil
+      include MysqlTypemap
+      include MysqlSQL
+      include MysqlExpression
+      
       def adapter_specific_exception
       
         Mysql::Error
         
       end
-    
-      include UtilMysql
-      include TypemapMysql
-      include SQLMysql
-      include ExpressionMysql
-    
+      
       def connect
         
-        @conn = Mysql.real_connect @host, @user, @pass, @database      
+        @conn = Mysql.real_connect @host, @username, @password, @database, @port, @socket
       
       rescue adapter_specific_exception => ex
            
         raise AdapterConnectionError.new(ex.message)
         
       end
-    
-      def version
-      
-        conn.get_server_info
-      
-      end
-      
+          
       def query ( sql )
         
         result = conn.query sql
-        @result = ResultMysql.new result
+        @result = MysqlResult.new result
         
       end      
           
+      def last_insert_id
+        
+        conn.last_insert_id
+        
+      end
+          
     end    
   end
 end

data/lib/imparcial/driver/postgre/expression.rb

@@ -1,13 +1,32 @@
-require 'imparcial/driver/postgre/expression/sequence'
-require 'imparcial/driver/postgre/expression/table'
-require 'imparcial/driver/postgre/expression/index'
+FileList[File.dirname(__FILE__)  + '/expression/*.rb'].each do |f|
+  require f
+end
 
 module Imparcial
   module Driver
-    module ExpressionPostgre
-      include Sequence
-      include Table
-      include Index
+    module PostgreExpression
+      
+      def insert ( options = {} )
+        
+        super options
+
+        begin
+          
+          seq_name = 'seq_' + options[:table_name].to_s + '_id'  
+          id = conn.query "SELECT currval('#{seq_name}')"
+        
+          @last_insert_id = id[0][0].to_i
+          
+        rescue adapter_specific_exception; end
+        
+      end
+      
+      def last_insert_id
+        
+        @last_insert_id
+        
+      end
+      
     end
   end
 end

data/lib/imparcial/driver/postgre/result.rb

@@ -1,6 +1,6 @@
 module Imparcial
   module Driver
-    class ResultPostgre < ResultBase
+    class PostgreResult < AbstractResult
     
       def rows