@@ -406,7 +406,7 @@ sub execute {

             }

             $query = $self->_create_query($sql,$opt{after_build_sql} || $opt{sqlfilter});

         }

-        $query->statement($opt{statement} || '');

+        $query->{statement} = $opt{statement} || '';

         $opt{reuse}->{$sql} = $query if $opt{reuse};

     }

@@ -425,7 +425,7 @@ sub execute {

     # Merge id to parameter

     if (defined $opt{id}) {

-        my $statement = $query->statement;

+        my $statement = $query->{statement};

         warn "execute method id option is DEPRECATED!" unless $statement;

         croak "execute id option must be specified with primary_key option"

           unless $opt{primary_key};

@@ -497,7 +497,7 @@ sub execute {

     }

     # Create bind values

-    my ($bind, $bind_types) = $self->_create_bind_values($param, $query->columns,

+    my ($bind, $bind_types) = $self->_create_bind_values($param, $query->{columns},

       $filter, $type_filters, $opt{bind_type} || $opt{type} || {});

     # Execute

@@ -523,7 +523,7 @@ sub execute {

     # DEBUG message

     if ($ENV{DBIX_CUSTOM_DEBUG}) {

-        warn "SQL:\n" . $query->sql . "\n";

+        warn "SQL:\n" . $query->{sql} . "\n";

         my @output;

         for my $value (@$bind) {

             $value = 'undef' unless defined $value;

@@ -1242,15 +1242,15 @@ sub _create_query {

         # Remove reserved word quote

         if (my $q = $self->_quote) {

             $q = quotemeta($q);

-            $_ =~ s/[$q]//g for @{$query->columns}

+            $_ =~ s/[$q]//g for @{$query->{columns}}

         }

         # Save query to cache

         $self->cache_method->(

             $self, $source,

             {

-                sql     => $query->sql, 

-                columns => $query->columns,

+                sql     => $query->{sql}, 

+                columns => $query->{columns},

                 tables  => $query->{tables} || []

             }

         ) if $cache;

@@ -1258,13 +1258,13 @@ sub _create_query {

     # Filter SQL

     if ($after_build_sql) {

-        my $sql = $query->sql;

+        my $sql = $query->{sql};

         $sql = $after_build_sql->($sql);

-        $query->sql($sql);

+        $query->{sql} = $sql;

     }

     # Save sql

-    $self->last_sql($query->sql);

+    $self->{last_sql} = $query->{sql};

     # Prepare statement handle

     my $sth;

@@ -1276,7 +1276,7 @@ sub _create_query {

     }

     # Set statement handle

-    $query->sth($sth);

+    $query->{sth} = $sth;

     # Set filters

     $query->{filters} = $self->filters;

@@ -52,7 +52,7 @@ sub build_query {

     $sql =~ s/\\:/:/g if index($sql, "\\:") != -1;

     # Create query

-    bless {sql => $sql, columns => $columns}, 'DBIx::Custom::Query';

+    return {sql => $sql, columns => $columns};

 }

 # DEPRECATED!

@@ -1552,13 +1552,13 @@ $dbi = DBIx::Custom->connect;

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);

 $query = $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1, query => 1);

-is(ref $query, 'DBIx::Custom::Query');

+ok(ref $query);

 $query = $dbi->update({$key2 => 2}, table => $table1, where => {$key1 => 1}, query => 1);

-is(ref $query, 'DBIx::Custom::Query');

+ok(ref $query);

 $query = $dbi->delete(table => $table1, where => {$key1 => 1}, query => 1);

-is(ref $query, 'DBIx::Custom::Query');

+ok(ref $query);

 $query = $dbi->select(table => $table1, where => {$key1 => 1, $key2 => 2}, query => 1);

-is(ref $query, 'DBIx::Custom::Query');

+ok(ref $query);

 test 'where';

 $dbi = DBIx::Custom->connect;

@@ -2509,7 +2509,7 @@ $query = $dbi->insert(

     id => [1, 2],

     query => 1

 );

-is(ref $query, 'DBIx::Custom::Query');

+ok(ref $query);

 is_deeply($param, {$key3 => 3, $key2 => 4});

 test 'model insert id and primary_key option';

@@ -3148,7 +3148,7 @@ $rows = [

     my $sth;

     for my $row (@$rows) {

       $query ||= $dbi->insert($row, table => $table1, query => 1);

-      $sth ||= $query->sth;

+      $sth ||= $query->{sth};

       $sth->execute(map { $row->{$_} } sort keys %$row);

     }

     is_deeply($dbi->select(table => $table1)->all,

@@ -3387,7 +3387,7 @@ for (my $i = 0; $i < @$datas; $i++) {

     my $builder = $dbi->query_builder;

     my $query = $builder->build_query($data->{source});

     is($query->{sql}, $data->{sql_expected}, "$data->{name} : sql");

-    is_deeply($query->columns, $data->{columns_expected}, "$data->{name} : columns");

+    is_deeply($query->{columns}, $data->{columns_expected}, "$data->{name} : columns");

 }

 $dbi = DBIx::Custom->new;

@@ -3460,15 +3460,15 @@ is($query->sql, 'a b = ? c { } { = ? } = ? d', "basic : 1");

 $source = "abc";

 $query = $builder->build_query($source);

-is($query->sql, 'abc', "basic : 2");

+is($query->{sql}, 'abc', "basic : 2");

 $source = "{= a}";

 $query = $builder->build_query($source);

-is($query->sql, 'a = ?', "only tag");

+is($query->{sql}, 'a = ?', "only tag");

 $source = "000";

 $query = $builder->build_query($source);

-is($query->sql, '000', "contain 0 value");

+is($query->{sql}, '000', "contain 0 value");

 $source = "a {= b} }";

 eval{$builder->build_query($source)};