[Rt-commit] [svn] r970 - in DBIx-SearchBuilder/trunk: . SearchBuilder SearchBuilder/Handle

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu May 27 23:57:57 2004
New Revision: 970

Modified:
   DBIx-SearchBuilder/trunk/   (props changed)
   DBIx-SearchBuilder/trunk/Changes
   DBIx-SearchBuilder/trunk/SearchBuilder.pm
   DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
   DBIx-SearchBuilder/trunk/SearchBuilder/Handle/Pg.pm
Log:
 ----------------------------------------------------------------------
 r1715 at tinbook:  jesse | 2004-05-28T03:45:41.725097Z
 
 
 ----------------------------------------------------------------------
 r1716 at tinbook:  jesse | 2004-05-28T03:57:48.918677Z
 
 Fixing query generation to be more oracle friendly. Oracle hated "AS" in table name aliases
 ----------------------------------------------------------------------


Modified: DBIx-SearchBuilder/trunk/Changes
==============================================================================
--- DBIx-SearchBuilder/trunk/Changes	(original)
+++ DBIx-SearchBuilder/trunk/Changes	Thu May 27 23:57:57 2004
@@ -1,5 +1,8 @@
 Revision history for Perl extension DBIx::SearchBuilder.
 
+1.00_03 - Remove "AS" from table name aliases on joins, since Oracle
+          doesn't like em.
+
 1.00_02	- Slightly cleaner code in SearchBuilder->GotoPage
 
 1.00_01 - Better handling of case insensitive comparisons on Postgres

Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm	Thu May 27 23:57:57 2004
@@ -5,7 +5,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = "1.00_01";
+$VERSION = "1.00_03";
 
 =head1 NAME
 

Modified: DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	Thu May 27 23:57:57 2004
@@ -740,7 +740,7 @@
         my $alias = $sb->_GetAlias( $args{'TABLE2'} );
 
         $sb->{'left_joins'}{"$alias"}{'alias_string'} =
-          " LEFT JOIN $args{'TABLE2'} as $alias ";
+          " LEFT JOIN $args{'TABLE2'} $alias ";
 
         $sb->{'left_joins'}{"$alias"}{'criteria'}{'base_criterion'} =
           " $args{'ALIAS1'}.$args{'FIELD1'} = $alias.$args{'FIELD2'}";

Modified: DBIx-SearchBuilder/trunk/SearchBuilder/Handle/Pg.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder/Handle/Pg.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder/Handle/Pg.pm	Thu May 27 23:57:57 2004
@@ -198,12 +198,12 @@
 
     if ( $args{'TYPE'} =~ /LEFT/i ) {
 
-        $string = " LEFT JOIN " . $args{'TABLE2'} . " as $alias ";
+        $string = " LEFT JOIN " . $args{'TABLE2'} . " $alias ";
 
     }
     else {
 
-        $string = " JOIN " . $args{'TABLE2'} . " as $alias ";
+        $string = " JOIN " . $args{'TABLE2'} . " $alias ";
 
     }
     $args{'SearchBuilder'}->{'left_joins'}{"$alias"}{'alias_string'} = $string;