Changeset 2208

Timestamp:

03/01/2008 02:50:19 PM (10 months ago)

Author:

zombor

Message:

Moving default exceptions back to the base database driver.

Location:

trunk/system/libraries/drivers

Files:

• Database.php (modified) (5 diffs)
• Database/Mssql.php (modified) (3 diffs)
• Database/Mysql.php (modified) (1 diff)
• Database/Pdosqlite.php (modified) (1 diff)
• Database/Pgsql.php (modified) (1 diff)

trunk/system/libraries/drivers/Database.php

@@ -64 +64 @@
          * @param  string  character set to use
          */
-        abstract public function set_charset($charset);
+        public function set_charset($charset)
+        {
+                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
+        }
 
         /**
@@ -191 +194 @@
          * @return  string
          */
-        abstract public function regex($field, $match, $type, $num_regexs);
+        public function regex($field, $match, $type, $num_regexs)
+        {
+                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
+        }
 
         /**
@@ -202 +208 @@
          * @return  string
          */
-        abstract public function notregex($field, $match, $type, $num_regexs);
+        public function notregex($field, $match, $type, $num_regexs)
+        {
+                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
+        }
 
         /**
@@ -230 +239 @@
          * @return  string
          */
-        abstract public function merge($table, $keys, $values);
+        public function merge($table, $keys, $values)
+        {
+                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
+        }
 
         /**
@@ -247 +259 @@
          * @return  Database_Stmt
          */
-        abstract public function stmt_prepare($sql = '');
+        public function stmt_prepare($sql = '')
+        {
+                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
+        }
 
         /**

trunk/system/libraries/drivers/Database/Mssql.php

@@ -101 +101 @@
         }
 
-        public function set_charset($charset)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
         public function escape_table($table)
         {
@@ -164 +159 @@
                 }
                 return $column;
-        }
-        
-        /* As far as I know, T-SQL doesn't have the REGEXP or NOT REGEXP keywords
-         * 
-         */
-        public function regex($field, $match = '', $type = 'AND ', $num_regexs)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
-        public function notregex($field, $match = '', $type = 'AND ', $num_regexs)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
-        /* MERGE (or UPSERT) not supported in SQL SERVER 2000
-         * somone with a more recent version should add this
-         * feature in.
-         */
-        public function merge($table, $keys, $values)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
         }
         
@@ -200 +173 @@
         {
                 return 'TOP '.$limit;
-        }
-
-        public function stmt_prepare($sql = '')
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
         }
 

trunk/system/libraries/drivers/Database/Mysql.php

@@ -192 +192 @@
         }
 
-        public function stmt_prepare($sql = '')
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
         public function compile_select($database)
         {

trunk/system/libraries/drivers/Database/Pdosqlite.php

@@ -132 +132 @@
         }
 
-        public function regex($field, $match = '', $type = 'AND ', $num_regexs)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
-        public function notregex($field, $match = '', $type = 'AND ', $num_regexs)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
-        public function merge($table, $keys, $values)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
-        }
-
         public function limit($limit, $offset = 0)
         {
                 return 'LIMIT '.$offset.', '.$limit;
-        }
-
-        public function stmt_prepare($sql = '')
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
         }
 

trunk/system/libraries/drivers/Database/Pgsql.php

@@ -150 +150 @@
 
                 return $prefix.' '.$this->escape_column($field).' NOT REGEXP \''.$this->escape_str($match) . '\'';
-        }
-
-        public function merge($table, $keys, $values)
-        {
-                throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__);
         }