Patch 63547: pgsql update by 'sun'

diff --git a/views.install b/views.install
index f689e7f..161b337 100644 (file)
--- a/views.install
+++ b/views.install
@@ -116,48 +116,48 @@
       break;
     case 'pgsql':
       db_query("CREATE TABLE {view_view} (
-        vid numeric(10) NOT NULL default '0',
+        vid integer NOT NULL default '0',
         name varchar(32) NOT NULL UNIQUE,
         description varchar(255),
         access varchar(255),
         -- page fields
-        page numeric(1),
+        page smallint,
         page_title varchar(255),
         page_header text,
-        page_header_format numeric(4) NOT NULL,
-        page_footer text,
-        page_footer_format numeric(4) NOT NULL,
+        page_header_format smallint NOT NULL,
         page_empty text,
-        page_empty_format numeric(4) NOT NULL,
+        page_empty_format smallint NOT NULL,
+        page_footer text,
+        page_footer_format smallint NOT NULL,
         page_type varchar(20),
-        use_pager numeric(1),
-        nodes_per_page numeric(2), -- yes, no more than 99
+        use_pager smallint,
+        nodes_per_page smallint, -- yes, no more than 99
         url varchar(255),
         -- menu fields
-        menu numeric(1),
-        menu_tab numeric(1),
-        menu_tab_default numeric(1),
-        menu_tab_weight numeric(4),
+        menu smallint,
+        menu_tab smallint,
+        menu_tab_default smallint,
+        menu_tab_weight smallint,
         menu_title varchar(255),
         -- block fields
-        block numeric(1),
+        block smallint,
         block_title varchar(255),
-        block_use_page_header numeric(1),
+        block_use_page_header smallint,
         block_header text,
-        block_header_format numeric(4) NOT NULL,
-        block_use_page_footer numeric(1),
+        block_header_format smallint NOT NULL,
+        block_use_page_footer smallint,
         block_footer text,
-        block_footer_format numeric(4) NOT NULL,
-        block_use_page_empty numeric(1),
+        block_footer_format smallint NOT NULL,
+        block_use_page_empty smallint,
         block_empty text,
-        block_empty_format numeric(4) NOT NULL,
+        block_empty_format smallint NOT NULL,
         block_type varchar(20),
-        nodes_per_block numeric(5),
-        block_more numeric(1),
+        nodes_per_block smallint,
+        block_more smallint,
         -- breadcrumb
-        breadcrumb_no_home numeric(1), -- true means start breadcrumb trail from 'Home'.
+        breadcrumb_no_home smallint, -- true means start breadcrumb trail from 'Home'.
         -- other
-        changed numeric(11),
+        changed integer,
         query text,
         countquery text,
         view_args_php text,
@@ -166,8 +166,8 @@
       db_query("CREATE INDEX {view_view_name_idx} ON {view_view} (name)");
 
       db_query("CREATE TABLE {view_sort} (
-        vid numeric(10) NOT NULL default '0',
-        position numeric(2),
+        vid integer NOT NULL default '0',
+        position smallint,
         field varchar(255),
         sortorder varchar(5),
         options varchar(255),
@@ -176,47 +176,47 @@
       db_query("CREATE INDEX {view_sort_vid_idx} ON {view_sort} (vid)");
 
       db_query("CREATE TABLE {view_argument} (
-        vid numeric(10) NOT NULL default '0',
+        vid integer NOT NULL default '0',
         type varchar(255),
         argdefault varchar(255),
         title varchar(255),
         options varchar(255),
-        position numeric(2)
+        position smallint
       )");
       db_query("CREATE INDEX {view_argument_vid_idx} ON {view_argument} (vid)");
 
       db_query("CREATE TABLE {view_tablefield} (
-        vid numeric(10) NOT NULL default '0',
+        vid integer NOT NULL default '0',
         tablename varchar(255),
         field varchar(255),
         label varchar(255),
         handler varchar(255),
-        sortable numeric(1),
+        sortable smallint,
         defaultsort varchar(5),
         options varchar(255),
-        position numeric(2)
+        position smallint
       )");
       db_query("CREATE INDEX {view_tablefield_vid_idx} ON {view_tablefield} (vid)");
 
       db_query("CREATE TABLE {view_filter} (
-        vid numeric(10) NOT NULL default '0',
+        vid integer NOT NULL default '0',
         tablename varchar(255),
         field varchar(255),
         value text,
         operator varchar(20),
         options varchar(255),
-        position numeric(2)
+        position smallint
       )");
       db_query("CREATE INDEX {view_filter_vid_idx} ON {view_filter} (vid)");
       db_query("CREATE TABLE {view_exposed_filter} (
-        vid numeric(10) unsigned NOT NULL default '0',
+        vid integer NOT NULL default '0',
         field varchar(255),
         label varchar(255),
-        optional numeric(1),
-        is_default numeric(1),
-        operator numeric(1),
-        single numeric(1),
-        position numeric(2)
+        optional smallint,
+        is_default smallint,
+        operator smallint,
+        single smallint,
+        position smallint
       )");
       db_query("CREATE INDEX {view_exposed_filter_vid_idx} ON {view_exposed_filter} (vid)");
       break;

diff --git a/views.module b/views.module
index b5940b5..95250b9 100644 (file)
--- a/views.module
+++ b/views.module
@@ -654,15 +654,6 @@ function views_build_view($type, $view, $args = array(), $use_pager = false, $li
     $output .= $function($view, $items);
   }
 
-/*
-  // In block mode, change $view->url to include the proper arguments.
-  if ($type == 'block' && $args) {
-    $url = views_get_summary_link_base($view->argument[count($args)-1]['type'], $view->url, count($args), $args);
-    if ($url) {
-      $view->url = $url;
-    }
-  }
-*/
   $view->real_url = views_get_url($view, $args);
 
   $view->use_pager = $use_pager;