- V4.0.3.0.0:

  Updated to OpenACS 5.7

acs-kernel.info

@@ -7,15 +7,15 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.6.0" url="http://openacs.org/repository/download/apm/acs-kernel-5.6.0.apm">
+    <version name="5.7.0" url="http://openacs.org/repository/download/apm/acs-kernel-5.7.0.apm">
         <owner url="mailto:oct@openacs.org">OpenACS Core Team</owner>
         <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
-        <release-date>2010-06-17</release-date>
+        <release-date>2011-06-12</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.</description>
         <maturity>3</maturity>
 
-        <provides url="acs-kernel" version="5.6.0"/>
+        <provides url="acs-kernel" version="5.7.0"/>
 
         <callbacks>
         </callbacks>

sql/oracle/upgrade/upgrade-5.6.0d7-5.6.0d8.sql

@@ -328,6 +328,7 @@ end new;
     return 'f';
   end is_child;
 
+
 end apm_package;
 /
 show errors

sql/postgresql/acs-objects-create.sql

@@ -475,8 +475,8 @@ for each row execute procedure acs_objects_context_id_in_tr ();
 create or replace function acs_objects_context_id_up_tr () returns trigger as '
 declare
         pair    record;
-        outer record;
-        inner record;
+        outer_record record;
+        inner_record record;
         security_context_root integer;
 begin
   if new.object_id = old.object_id
@@ -487,13 +487,13 @@ begin
   end if;
 
   -- Remove my old ancestors from my descendants.
-  for outer in select object_id from acs_object_context_index where 
+  for outer_record in select object_id from acs_object_context_index where 
                ancestor_id = old.object_id and object_id <> old.object_id loop
-    for inner in select ancestor_id from acs_object_context_index where
+    for inner_record in select ancestor_id from acs_object_context_index where
                  object_id = old.object_id and ancestor_id <> old.object_id loop
       delete from acs_object_context_index
-      where object_id = outer.object_id
-        and ancestor_id = inner.ancestor_id;
+      where object_id = outer_record.object_id
+        and ancestor_id = inner_record.ancestor_id;
     end loop;
   end loop;
 
@@ -1197,9 +1197,9 @@ begin
    v_table_name := acs_object__get_attr_storage_table(v_storage);
    v_key_sql    := acs_object__get_attr_storage_sql(v_storage);
 
-   for v_rec in execute ''select '' || quote_ident(v_column) || ''::text as return from '' || quote_ident(v_table_name) || '' where '' || v_key_sql
+   for v_rec in execute ''select '' || quote_ident(v_column) || ''::text as column_return from '' || quote_ident(v_table_name) || '' where '' || v_key_sql
       LOOP
-        v_return := v_rec.return;
+        v_return := v_rec.column_return;
         exit;
    end loop;
    if not FOUND then 

sql/postgresql/apm-create.sql

@@ -1564,7 +1564,7 @@ begin
 
     select attr_value into value from apm_parameter_values v
     where v.package_id is null
-    and parameter_id = get_value__parameter_id;
+    and parameter_id = v_parameter_id;
 
     return value;
    

sql/postgresql/site-nodes-create.sql

@@ -43,7 +43,7 @@ create table site_nodes (
                         primary key,
         parent_id       integer constraint site_nodes_parent_id_fk
                         references site_nodes (node_id),
-        name            varchar(100)
+        name            varchar(100) 
                         constraint site_nodes_name_ck
                         check (name not like '%/%'),
         constraint site_nodes_un
@@ -330,12 +330,18 @@ begin
       v_rest := substr(v_url, v_pos + 1);
     end if;
 
-    -- begin
-      -- Is there a better way to do these freaking null compares?
+    if node_id__parent_id is not null then 
       select node_id, directory_p into v_node_id, v_directory_p
       from site_nodes
-      where coalesce(parent_id, 3.14) = coalesce(node_id__parent_id, 3.14)
-      and coalesce(name, chr(10)) = coalesce(v_first, chr(10));
+      where parent_id = node_id__parent_id
+      and name = v_first;
+    else 
+      select node_id, directory_p into v_node_id, v_directory_p
+      from site_nodes
+      where parent_id is null 
+      and name = v_first;
+    end if;
+
     if NOT FOUND then 
         return site_node__find_pattern(node_id__parent_id);
     end if;